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

application/api/controller/Manufacture.php

@@ -399,6 +399,7 @@ class Manufacture extends Api
         }
         $where = [
             'Gy0_gdbh' => $data['workOrder'],
+            'Gy0_yjno' => $data['yjno'],
             'Gy0_gxh'  => $data['processCode']
         ];
         $sql = \db('工单_工艺资料')->where($where)->fetchSql(true)->update(['PD_WG'=>date('Y-m-d H:i:s',time())]);

application/api/controller/OrderSuperLoss.php

@@ -1560,8 +1560,9 @@ class OrderSuperLoss extends Api
             $guige = \db('物料_存货编码')
                 ->where('物料代码',$data['成品代号'])
                 ->value('rtrim(规格)');
+
             //工序超节损金额
-            if ($guige === '小盒'){
+            if (strpos($guige,'小盒') !== false){
                 $moneyRate = 0.02;
             }else{
                 $moneyRate = 0.09;