Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

application/api/controller/ReportingWork.php

@@ -30,7 +30,7 @@ class ReportingWork extends Api
         if (Request::instance()->isPost() == false){
             $this->error('非法请求');
         }
-        $params = Request::instance()->request();
+        $params = Request::instance()->post();
         if (!isset($params['machine']) || empty($params['machine'])){
             $this->error('参数不能为空');
         }
@@ -109,7 +109,7 @@ class ReportingWork extends Api
         if (Request::instance()->isPost() == false){
             $this->error('非法请求');
         }
-        $params = Request::instance()->request();
+        $params = Request::instance()->post();
         if (!isset($params['order']) || empty($params['order'])){
             $this->error('参数不能为空');
         }
@@ -197,7 +197,7 @@ class ReportingWork extends Api
         if (Request::instance()->isPost() == false){
             $this->error('非法请求');
         }
-        $params = Request::instance()->request();
+        $params = Request::instance()->post();
         if (empty($params['machine']) || empty($params['type']) || empty($params['order'])) {
             $this->error('参数错误');
         }
@@ -317,7 +317,7 @@ class ReportingWork extends Api
         if (Request::instance()->isPost() == false){
             $this->error('非法请求');
         }
-        $params = Request::instance()->request();
+        $params = Request::instance()->post();
         $machine = $params['sczl_jtbh'].'#';
         $batchData = []; //批次追踪数据
         $batch = $params['bom'];
@@ -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{