当班明细、制程清单

application/api/controller/Facility.php

@@ -472,13 +472,12 @@ class Facility extends Api
         $workOrder = input('Gd_gdbh');
         $team = input('team');
         if (empty($machine) || empty($workOrder) || empty($team)){
-            $this->error('参数错误');
+            $this->success('');
         }
         $name = \db('工单_基本资料')->where('Gd_gdbh',$workOrder)->field('rtrim(Gd_cpmc) as productName')->find();
         $where = [
             'sczl_gdbh' => $workOrder,
             'sczl_jtbh' => $machine,
-//            '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 产量,
@@ -488,7 +487,7 @@ class Facility extends Api
         rtrim(sczl_sj1) as sj1,rtrim(sczl_sj2) as sj2';
         $list = \db('设备_产量计酬')->where($where)->field($field)->order('UniqId desc')->select();
         if (empty($list)){
-            $this->success('未找到生产记录');
+            $this->success('');
         }
         foreach ($list as $k=>$v){
             if ($v['yjno']<10){

application/api/controller/Manufacture.php

@@ -809,7 +809,7 @@ class Manufacture extends Api
                 'b.PD_WG' => '1900-01-01 00:00:00'
             ])
             ->where($where)
-            ->group('a.Gd_gdbh')
+            ->group('a.Gd_gdbh,b.Gy0_gxh')
             ->order('Gy0_sj1')
             ->select();
         if (empty($list)){

application/api/controller/Synchronization.php

@@ -82,6 +82,7 @@ class Synchronization extends Api
                     '产品版本号' => $value['版本号'],
                     '销售订单号' => $value['销售订单号'],
                     '警语版面' => $value['警语版面'],
+                    '码源数量' => substr(str_replace('.','',$value['投料数量']),0,-2),
                     'Gd_desc' => $value['备注'],
                     '接单日期' => $value['接单日期'],
                     '开单日期' => $value['开单日期'],
@@ -119,6 +120,7 @@ class Synchronization extends Api
                     '产品版本号' => $value['版本号'],
                     '销售订单号' => $value['销售订单号'],
                     '警语版面' => $value['警语版面'],
+                    '码源数量' => substr(str_replace('.','',$value['投料数量']),0,-2),
                     'Gd_desc' => $value['备注'],
                     '接单日期' => $value['接单日期'],
                     '开单日期' => $value['开单日期'],