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

application/api/controller/Facility.php

@@ -221,6 +221,12 @@ class Facility extends Api
         $machine = $params['machine'];
         $machineCode = \db('dic_lzde')->where('适用机型',$machine)->value('sys_bh');
         $data = \db('设备_产量采集')->where('设备编号',$machine)->order('UniqId desc')->find();
+        if (empty($data)){
+            $this->success('未找到生产订单');
+        }
+        if (rtrim($data['工单编号']) === '' || rtrim($data['工单编号']) === null ){
+            $this->success('未找到生产订单');
+        }
         $endTime = \db('工单_工艺资料')
             ->where('Gy0_gdbh',$data['工单编号'])
             ->where('Gy0_gxh',$data['工序号'])
@@ -316,15 +322,13 @@ class Facility extends Api
                 rtrim(b.Gy0_最早开工时间) AS 最早开工时间
             FROM
                 `工单_基本资料` AS a
-                JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh
-                JOIN `产品_基本资料` AS c ON a.`成品代号` = c.`产品编号` 
+                JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh 
                 JOIN `工单_印件资料` AS d ON a.Gd_gdbh = d.Yj_Gdbh
                 LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gd_gdbh AND e.sczl_jtbh = b.Gy0_sbbh
             WHERE
                 a.gd_statu = '2-生产中' 
                 AND a.`行号` = '1' 
                 AND b.Gy0_sbbh = '{$machine}' 
-                AND c.`状态` = '' 
                 AND b.PD_WG = '1900-01-01 00:00:00' 
                 AND b.Gy0_sj1 <> '1900-01-01 00:00:00'
             GROUP BY a.Gd_gdbh
@@ -474,7 +478,7 @@ class Facility extends Api
         $where = [
             'sczl_gdbh' => $workOrder,
             'sczl_jtbh' => $machine,
-            'sczl_cl' => ['<>',0.0],
+//            'sczl_cl' => ['<>',0.0],
             'sczl_bzdh' => $team,
         ];
         $field = 'rtrim(sczl_gdbh) as 工单编号,rtrim(sczl_yjno) as yjno,rtrim(sczl_gxmc) as gxmc,rtrim(sczl_num) as 标牌号,rtrim(sczl_cl) as 产量,
@@ -1110,7 +1114,9 @@ class Facility extends Api
                 WHERE
                     a.`使用部门` = '{$workshop}' 
                 GROUP BY
-                    a.`设备编号`";
+                    a.`设备编号`
+                ORDER BY 
+                    a.UniqId";
         $list = \db()->query($sql);
         foreach ($list as $key=>$value){
             if ($value['状态'] == ''){
@@ -1504,9 +1510,12 @@ class Facility extends Api
             $this->error('非法请求');
         }
         $params = Request::instance()->post();
-        if (!isset($params['machine']) || empty($params['machine'])) {
+        if (!isset($params['machine']) || empty($params['machine'] )) {
             $this->error('参数不能为空');
         }
+        if (empty($params['team_id']) || empty($params['sczl_bzdh'])){
+            $this->error('请先选择班组成员');
+        }
         $machine = $params['machine'] . '#';
         $data = [];
         $lastData = \db('设备_产量采集')

application/api/controller/Manufacture.php

@@ -810,6 +810,7 @@ class Manufacture extends Api
             ])
             ->where($where)
             ->group('a.Gd_gdbh')
+            ->order('Gy0_sj1')
             ->select();
         if (empty($list)){
             $this->success('',[]);

application/api/controller/OrderSuperLoss.php

@@ -113,7 +113,7 @@ class OrderSuperLoss extends Api
             $where['a.成品名称'] = array('like','%'.$params['search'].'%');
         }
         $where['b.行号' ] = 1;
-        $where['a.jjcp_smb' ] = '末 板';
+        $where['a.jjcp_smb' ] = array('IN', array('末 板', '末板'));
         $limit = $params['limit'];
         if (empty($limit)){
             $limit = 15;

application/api/controller/ReportingWork.php

@@ -372,37 +372,42 @@ class ReportingWork extends Api
         $data['码结束行'] = 0;
         $data['mod_rq'] = '1900-01-01 00:00:00';
         $data['sys_rq'] = date('Y-m-d H:i:s');
-
-        $batchData = explode(',',$batch);
-        $newData = [];
-        $batchUniqId = \db('物料_批次跟踪')->order('UniqId desc')->value('UniqId');
-        if ($batchUniqId < 10000000){
-            $batchUniqId = 10000000;
-        }
-        foreach ($batchData as $key=>$item){
-            $batchUniqId++;
-            $val = explode('-',$item);
-            $newData[$key]['wlbh'] = $val[0];
-            $newData[$key]['wlBatch'] = $val[1];
-            $newData[$key]['sczl_gdbh'] = $data['sczl_gdbh'];
-            $newData[$key]['sczl_yjno'] = $data['sczl_yjno'];
-            $newData[$key]['sczl_gxh'] = $data['sczl_gxh'];
-            $newData[$key]['sczl_gxmc'] = $data['sczl_gxmc'];
-            $newData[$key]['sczl_num'] = $data['sczl_num'];
-            $newData[$key]['sys_id'] = $data['sys_id'];
-            $newData[$key]['sys_rq'] = $data['sys_rq'];
-            $newData[$key]['UniqID'] = $batchUniqId;
+        if (!empty($batch)){
+            $batchData = explode(',',$batch);
+            $newData = [];
+            $batchUniqId = \db('物料_批次跟踪')->order('UniqId desc')->value('UniqId');
+            if ($batchUniqId < 10000000){
+                $batchUniqId = 10000000;
+            }
+            foreach ($batchData as $key=>$item){
+                $batchUniqId++;
+                $val = explode('-',$item);
+                $newData[$key]['wlbh'] = $val[0];
+                $newData[$key]['wlBatch'] = $val[1];
+                $newData[$key]['sczl_gdbh'] = $data['sczl_gdbh'];
+                $newData[$key]['sczl_yjno'] = $data['sczl_yjno'];
+                $newData[$key]['sczl_gxh'] = $data['sczl_gxh'];
+                $newData[$key]['sczl_gxmc'] = $data['sczl_gxmc'];
+                $newData[$key]['sczl_num'] = $data['sczl_num'];
+                $newData[$key]['sys_id'] = $data['sys_id'];
+                $newData[$key]['sys_rq'] = $data['sys_rq'];
+                $newData[$key]['UniqID'] = $batchUniqId;
+            }
         }
 
-
         $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);
+            if (!empty($batch)){
+                $batch_sql = \db('物料_批次跟踪')->fetchSql(true)->insertAll($newData);
+                $batch_res = Db::query($batch_sql);
+            }else{
+                $batch_res = true;
+            }
+
             Db::commit();
             cache('MachineProductReport-getList',null);
         }catch (\Exception $e){

application/api/controller/WorkOrder.php

@@ -527,6 +527,8 @@ class WorkOrder extends Api
         foreach ($oldProcessData as $k=>$v){
             $oldProcessData[$k]['Gy0_gdbh']  = $oldWorkOrder;
             $oldProcessData[$k]['Sys_id'] = '';
+            $oldProcessData[$k]['Gy0_sj1'] = '1900-01-01 00:00:00';
+            $oldProcessData[$k]['Gy0_sj2'] = '1900-01-01 00:00:00';
             $oldProcessData[$k]['UniqId'] = $lastId + $k;
             $oldProcessData[$k]['PD_WG'] = '1900-01-01 00:00:00';
         }

application/api/controller/WorkOrderVerification.php

@@ -706,9 +706,34 @@ class WorkOrderVerification extends Api
         $total = db('设备_产量计酬')->where('sczl_gdbh',$params['order'])->order('sczl_num')->column('distinct(sczl_num)');
         $where['sczl_gxh'] = (int)$params['gxNo'];
         $where['sczl_gdbh'] = $params['order'];
+        //机器设备数据
         $process = db('设备_产量计酬')->where($where)->order('sczl_num')->column('distinct(sczl_num)');
+        //手工数据
+        $option['qczl_gdbh'] = $params['order'];
+        $option['qczl_gxh'] = (int)$params['gxNo'];
+        $handProcess = db('db_qczl')->where($option)->field('qczl_num,qczl_NumDesc1,qczl_NumDesc2,qczl_NumDesc3,qczl_NumDesc4,qczl_NumDesc5,qczl_NumDesc6,qczl_NumDesc7,qczl_NumDesc8')->select();
+        // 提取数据
+        $result = array();
+        foreach ($handProcess as $subArray) {
+            $qczl_num = $subArray["qczl_num"];
+            $result[] = $qczl_num;
+            // 提取以qczl_NumDesc开头的键对应的值
+            for ($i = 1; $i <= 8; $i++) {
+                $key = "qczl_NumDesc" . $i;
+                if ($subArray[$key] != 0){
+                    $result[] = $subArray[$key];
+                }
+            }
+        }
+        // 去重
+        $result = array_unique($result);
+        // 对结果进行排序
+        sort($result);
         $res['total_process'] = $total;
         $res['process'] = $process;
+        if (empty($process)){
+            $res['process'] = $result;
+        }
         $this->success('请求成功',$res);
     }
     /**