当日上报产量修改

application/api/controller/Facility.php

@@ -89,28 +89,37 @@ class Facility extends Api
             'sczl_jtbh' => $machine,
             'sczl_rq' => date('Y-m-d H:i:s',strtotime($date.' 00:00:00')),
         ];
-        $field = 'rtrim(sczl_gdbh) as 工单编号,rtrim(sczl_yjno) as yjno,rtrim(sczl_gxmc) as gxmc,rtrim(sczl_num) as num,rtrim(sczl_sj1) as sj1,
+        $field = 'rtrim(sczl_gdbh) as 工单编号,rtrim(sczl_dedh) as dedh,rtrim(sczl_yjno) as yjno,rtrim(sczl_gxmc) as gxmc,rtrim(sczl_num) as num,rtrim(sczl_sj1) as sj1,
         rtrim(sczl_sj2) as sj2,rtrim(sczl_cl) as 产量,rtrim(sczl_bzdh) as bzdh,rtrim(sczl_zcfp) as 制程废品,rtrim(sczl_zccp) as 制程次品,rtrim(sczl_前工序废) as 前工序废,rtrim(sczl_来料少数) as 来料异常,
         rtrim(sczl_装版工时) as 装版工时,rtrim(sczl_保养工时) as 保养工时,rtrim(sczl_打样工时) as 打样工时,rtrim(sczl_异常停机工时) as 异常总工时,rtrim(sczl_设备运行工时) as 通电工时,
         rtrim(码开始行) as 码开始行,rtrim(码结束行) as 码结束行,rtrim(码包) as 码包,rtrim(主电表) as 主电表,rtrim(辅电表) as 辅电表,rtrim(sczl_ms) as 色度数,
         rtrim(sys_id) as 用户,rtrim(mod_rq) as 更新时间,rtrim(sczl_异常工时1) as 异常补时,rtrim(sczl_异常类型1) as 异常类型,sczl_bh1,sczl_bh2,
         sczl_bh3,sczl_bh4,sczl_bh5,sczl_bh6,sczl_bh7,sczl_bh8,sczl_bh9,sczl_bh10,sczl_rate1,sczl_rate2,sczl_rate3,sczl_rate4,sczl_rate5,sczl_rate6,sczl_rate7,
-        sczl_rate8,sczl_rate9,sczl_rate10,rtrim(UniqId) as UniqId';
+        sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId';
         //机台信息
         $machineDetail = \db('设备_基本资料')->where('设备编号',$machine)->field('rtrim(千件工价) as 千件工价,rtrim(日定额) as 日定额')->find();
         //工单编号
         $Gd_gdbh = \db('设备_产量计酬')->where($where)->distinct(true)->column('sczl_gdbh');
         //产品名称
-        $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$Gd_gdbh)->field('rtrim(Gd_gdbh) as gdbh')->find();
+        $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$Gd_gdbh)->field('rtrim(成品名称) as 成品名称,rtrim(Gd_cpmc) as cpmc')->find();
         //组员信息
-        $list = \db('设备_产量计酬')->where($where)->field($field)->cache(true,86400)->select();
+        $list = \db('设备_产量计酬')->where($where)->field($field)->select();
         $totalA = \db('设备_产量计酬')->where($where)->where('sczl_bzdh','A班')->field('SUM(sczl_cl) as 产量')->select();
         $totalB = \db('设备_产量计酬')->where($where)->where('sczl_bzdh','B班')->field('SUM(sczl_cl) as 产量')->select();
         if (empty($list)){
             $this->success('',[]);
         }
         foreach ($list as $key=>$value){
-            $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['gdbh'];
+            if (!empty($productName['成品名称'])){
+                $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['成品名称'];
+                $list[$key]['cpmc'] = $productName['成品名称'];
+            }elseif (empty($productName['成品名称']) && !empty($productName['cpmc'])){
+                $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['cpmc'];
+                $list[$key]['cpmc'] = $productName['cpmc'];
+            }else{
+                $list[$key]['产品名称'] = $value['工单编号'];
+                $list[$key]['cpmc'] = '';
+            }
             if ($value['yjno']<10){
                 $list[$key]['yjno'] = '0'.$value['yjno'];
             }
@@ -127,7 +136,6 @@ class Facility extends Api
                 }
                 unset($list[$key]['sczl_bh'.$i],$list[$key]['sczl_rate'.$i]);
             }
-            unset($list[$key]['工序编号'],$list[$key]['yjno'],$list[$key]['gxmc'],$list[$key]['num'],$list[$key]['sj1'],$list[$key]['sj2'],$list[$key]['bzdh']);
         }
         $list['totalA'] = $totalA[0]['产量'];
         $list['totalB'] = $totalB[0]['产量'];
@@ -1824,25 +1832,23 @@ class Facility extends Api
             $this->error('请求错误');
         }
         $param = Request::instance()->post();
-        if (empty($param[0]['UniqId'])){
+        if (empty($param['UniqId'])){
             $this->error('参数错误');
         }
-        $i = 0;
-        foreach ($param as $key=>$value){
-            unset($param['UniqId']);
-            $sql = \db('设备_产量计酬')
-                ->where('UniqId',$param[$key]['UniqId'])
-                ->fetchSql(true)
-                ->update($value);
-            $res = \db()->query($sql);
-            if ($res === false){
-                $i++;
-            }
-        }
-        if ($i !== 0){
-            $this->error('修改失败');
-        }else{
+        $data = $param;
+        unset($data['UniqId']);
+        $sql = \db('设备_产量计酬')
+            ->where('UniqId',$param['UniqId'])
+            ->fetchSql(true)
+            ->update($data);
+        $res = \db()->query($sql);
+        if ($res !== false){
             $this->success('修改成功');
+        }else {
+            $this->error('修改失败');
         }
     }
+
+
+
 }