|
|
@@ -389,18 +389,20 @@ class ReportingWork extends Api
|
|
|
$newData[$key]['sys_rq'] = $data['sys_rq'];
|
|
|
$newData[$key]['UniqID'] = $batchUniqId;
|
|
|
}
|
|
|
- $sql = \db('设备_产量计酬')->fetchSql(true)->insert($data);
|
|
|
- $res = Db::query($sql);
|
|
|
- $batch_sql = \db('物料_批次跟踪')->fetchSql(true)->insertAll($newData);
|
|
|
- $batch_res = Db::query($batch_sql);
|
|
|
-// $res = true;
|
|
|
-// $batch_res = true;
|
|
|
-// Db::startTrans();
|
|
|
-// try {
|
|
|
-// Db::commit();
|
|
|
-// }catch (\Exception $e){
|
|
|
-// Db::rollback();
|
|
|
-// }
|
|
|
+
|
|
|
+
|
|
|
+ $res = false;
|
|
|
+ $batch_res = false;
|
|
|
+ Db::startTrans();
|
|
|
+ try {
|
|
|
+ $sql = \db('设备_产量计酬')->fetchSql(true)->insert($data);
|
|
|
+ $res = Db::query($sql);
|
|
|
+ $batch_sql = \db('物料_批次跟踪')->fetchSql(true)->insertAll($newData);
|
|
|
+ $batch_res = Db::query($batch_sql);
|
|
|
+ Db::commit();
|
|
|
+ }catch (\Exception $e){
|
|
|
+ Db::rollback();
|
|
|
+ }
|
|
|
if ($res === false || $batch_res === false){
|
|
|
$this->error('报工失败');
|
|
|
}else{
|