工艺印件修改

application/api/controller/Product.php

@@ -1073,4 +1073,29 @@ class Product extends Api
             $this->error('删除失败');
         }
     }
+
+    /**
+     * 修改产品工艺资料
+     * @ApiMethod POST
+     *
+     */
+    public function productEdit(){
+        if (Request::instance()->isPost() == false){
+            $this->error('非法请求');
+        }
+        $params = Request::instance()->post();
+        if (empty($params)){
+            $this->error('参数不能为空');
+        }
+        $UniqId = $params['UniqID'];
+        unset($params['UniqID']);
+        $params['Mod_rq'] = date('Y-m-d H:i:s');
+        $sql = \db('产品_工艺资料')->where('UniqID',$UniqId)->fetchSql(true)->update($params);
+        $res = Db::query($sql);
+        if ($res !== false){
+            $this->success('修改成功');
+        }else{
+            $this->error('修改失败');
+        }
+    }
 }

application/api/controller/WorkOrder.php

@@ -986,48 +986,20 @@ class WorkOrder extends Api
         if (empty($param) || isset($param['Uniqid']) === false){
             $this->error('参数错误');
         }
-        $data = [
-            'yj_Yjno' => isset($param['yjno'])?$param['yjno']:'',
-            'yj_Yjdh' => isset($param['yjdh'])?$param['yjdh']:'',
-            'yj_yjmc' => isset($param['yjmc'])?$param['yjmc']:'',
-            'yj_zzdh' => isset($param['zzdh'])?$param['zzdh']:'',
-            'yj_zzdh1' => isset($param['zzdh1'])?$param['zzdh1']:'',
-            'yj_zzdh2' => isset($param['zzdh2'])?$param['zzdh2']:'',
-            'yj_zzdh3' => isset($param['zzdh3'])?$param['zzdh3']:'',
-            'yj_zzdh4' => isset($param['zzdh4'])?$param['zzdh4']:'',
-            'yj_zzmc' => isset($param['zzmc'])?$param['zzmc']:'',
-            'yj_zzmc1' => isset($param['zzmc1'])?$param['zzmc1']:'',
-            'yj_zzmc2' => isset($param['zzmc2'])?$param['zzmc2']:'',
-            'yj_zzmc3' => isset($param['zzmc3'])?$param['zzmc3']:'',
-            'yj_zzmc4' => isset($param['zzmc4'])?$param['zzmc4']:'',
-            'yj_成品数量' => isset($param['cpsl'])?$param['cpsl']:'',
-            'yj_实际投料' => isset($param['sjtl'])?$param['sjtl']:'',
-            'yj_平张投料' => isset($param['pztl'])?$param['pztl']:'',
-            'yj_tlgg' => isset($param['tlgg'])?$param['tlgg']:'',
-            'yj_klgg' => isset($param['klgg'])?$param['klgg']:'',
-            'Yj_核算规格' => isset($param['hsgg'])?$param['hsgg']:'',
-            'yj_ks' => isset($param['ks'])?$param['ks']:'',
-            'yj_ls' => isset($param['ls'])?$param['ls']:'',
-            'yj_desc' => isset($param['desc'])?$param['desc']:'',
-        ];
-        //获取工单编号
-        $workOrder = \db('工单_印件资料')->where('Uniqid',$param['Uniqid'])->field('Yj_Gdbh,yj_Yjno')->find();
-        if (empty($workOrder)){
-            $this->success('未找到该工单印件资料');
-        }
         //重新分配工序计划产量
-        $result = $this->PlannedProcessYield($workOrder['Yj_Gdbh'],$workOrder['yj_Yjno'],0,$param['pztl']);
+        $result = $this->PlannedProcessYield($param['Yj_Gdbh'],$param['yj_Yjno'],0,$param['pztl']);
         if ($result === false){
             $this->success('修改工序产量失败');
         }
-        $sql = \db('工单_印件资料')->where('Uniqid',$param['Uniqid'])->fetchSql(true)->update($data);
+        $UniqId = $param['Uniqid'];
+        unset($param['Uniqid']);
+        $sql = \db('工单_印件资料')->where('Uniqid',$UniqId)->fetchSql(true)->update($param);
         $res = Db::query($sql);
         if ($res !== false){
             $this->success('成功');
         }else{
             $this->error('失败');
         }
-
     }
 
     /**
@@ -1054,25 +1026,18 @@ class WorkOrder extends Api
             $rate['rate0'] = 0;
             $rate['rate1'] = 0;
         }else{
-            $rate = \db('dic_lzsh')->where('sys_bh',$param['shdh'])->field('rtrim(sys_rate0) as rate0,rtrim(sys_rate1) as rate1')->find();
+            $rate = \db('dic_lzsh')->where('sys_bh',$param['Gy0_shdh'])->field('rtrim(sys_rate0) as rate0,rtrim(sys_rate1) as rate1')->find();
         }
-        $data = [
-            '重点工序' => isset($param['zdgx'])?$param['zdgx']:'',
-            '备选工序' => isset($param['bxgx'])?$param['bxgx']:'',
-            'Gy0_sbbh' => isset($param['sbbh'])?$param['sbbh']:'',
-            'Gy0_Rate0' => isset($rate['rate0'])?$rate['rate0']:0,
-            'Gy0_Rate1' => isset($rate['rate1'])?$rate['rate1']:0,
-            'Gy0_shdh' => isset($param['shdh'])?$param['shdh']:'',
-            '损耗系数' => isset($param['shxs'])?$param['shxs']:'',
-            '工价系数' => isset($param['ndxs'])?$param['ndxs']:'',
-            'Gy0_小时产能' => $param['xscn'],
-            'Mod_rq' => date('Y-m-d H:i:s',time()),
-        ];
+        $param['Gy0_Rate0']= isset($rate['rate0'])?$rate['rate0']:0;
+        $param['Gy0_Rate1'] = isset($rate['rate1'])?$rate['rate1']:0;
+        $param['Mod_rq']  = date('Y-m-d H:i:s',time());
+        $UniqId = $param['UniqId'];
+        unset($param['UniqId']);
         //修改工艺资料
-        $sql = \db('工单_工艺资料')->where('UniqId',$param['UniqId'])->fetchSql(true)->update($data);
+        $sql = \db('工单_工艺资料')->where('UniqId',$UniqId)->fetchSql(true)->update($param);
         $res = Db::query($sql);
         //获取工艺资料数据
-        $list = \db('工单_工艺资料')->where('UniqId',$param['UniqId'])->field('Gy0_yjno,Gy0_gxh,rtrim(Gy0_计划接货数) as 计划接货数')->find();
+        $list = \db('工单_工艺资料')->where('UniqId',$UniqId)->field('Gy0_yjno,Gy0_gxh,rtrim(Gy0_计划接货数) as 计划接货数')->find();
         //修改工单状态
         $status = \db('工单_基本资料')->where('Gd_gdbh',$param['workOrder'])->field('rtrim(gd_statu) as status')->find();
         if ($status['status'] !== '2-生产中'){