超节损投料修改优化

application/api/controller/OrderSuperLoss.php

@@ -950,7 +950,7 @@ class OrderSuperLoss extends Api
         }
         $field = "a.Gd_gdbh,rtrim(c.yj_Yjdh) as yj_yjdh,c.yj_Yjno, c.yj_ks,c.yj_ls,rtrim(c.yj_zzdh) as yj_zzdh,
                   rtrim(b.BOM_物料名称) as BOM_物料名称,rtrim(c.yj_tlgg) as yj_tlgg,rtrim(d.st_dw) as BOM_投料单位,
-                  a.订单数量,c.yj_平张投料, b.BOM_实际用量,d.st_sl as 实际投料,a.投料确认,d.Uniqid as UniqId";
+                  a.订单数量,c.yj_平张投料, b.BOM_实际用量,d.st_sl as 实际投料,a.oldSl as 原投料,a.投料确认,d.Uniqid as UniqId";
         $data =db('工单_基本资料')->alias('a')
             ->join('工单_印件资料 c','a.Gd_gdbh = c.Yj_Gdbh ','left')
             ->join('工单_bom资料 b','c.Yj_Gdbh = b.BOM_工单编号 AND c.yj_zzdh = b.BOM_物料编码','left')
@@ -998,22 +998,16 @@ class OrderSuperLoss extends Api
         $i = 0;
         $list = \db('物料_收发记录')->where('Uniqid',$params['0']['UniqId'])->find();
         foreach ($params as $key=>$value){
-            $danwei = \db('物料_收发记录')
+
+            $tl_sql = \db('物料_收发记录')
                 ->where('Uniqid',$value['UniqId'])
-                ->value('st_dw');
-            if ($danwei === '吨'){
-                $danwei = '张';
-            }
-            if (!empty($value['number'])){
-                $tl_sql = \db('物料_收发记录')
-                    ->where('Uniqid',$value['UniqId'])
-                    ->fetchSql(true)
-                    ->update(['st_sl'=>$value['number'],'st_dw'=>$danwei]);
-                $tlRes = Db::query($tl_sql);
-                if (!$tlRes){
-                    $i++;
-                }
+                ->fetchSql(true)
+                ->update(['st_sl'=>$value['number'],'st_oldSl'=>$value['old_number']]);
+            $tlRes = Db::query($tl_sql);
+            if (!$tlRes){
+                $i++;
             }
+
         }
         $total_num = \db('物料_收发记录')
             ->alias('a')
@@ -1292,14 +1286,14 @@ class OrderSuperLoss extends Api
         if ($data['投料'] == null){
             return false;
         }
-        if (!empty($data['yj_tlgg'])){
-            $number1 = (int)substr($data['yj_tlgg'],0,3);
-            $number2 = (int)substr($data['yj_tlgg'],4,3);
-            preg_match('/(\d+)g/',$data['yj_zzmc'], $matches);
-            if ($data['st_dw'] === '吨'){
-                $data['投料'] = round(($data['投料']*1000*1000)/$matches[1]/($number1*$number2)*1000000);
-            }
-        }
+//        if (!empty($data['yj_tlgg'])){
+//            $number1 = (int)substr($data['yj_tlgg'],0,3);
+//            $number2 = (int)substr($data['yj_tlgg'],4,3);
+//            preg_match('/(\d+)g/',$data['yj_zzmc'], $matches);
+//            if ($data['st_dw'] === '吨'){
+//                $data['投料'] = round(($data['投料']*1000*1000)/$matches[1]/($number1*$number2)*1000000);
+//            }
+//        }
 
         //将开数、联数为0重新赋值
         if ($data['ls'] == 0) {