优化

application/api/controller/WorkOrder.php

@@ -2669,7 +2669,7 @@ class WorkOrder extends Api
         ';
         $list = \db('物料_库存')
             ->alias('a')
-//            ->join('设备_报工日志 d','a.批次号 = d.批次号')
+           ->join('设备_报工日志 d','a.批次号 = d.批次号')
             ->join('工单_面料资料 b','a.物料编号 = b.BOM_物料编码')
             ->join('工单关联表 c','a.关联号 = c.关联编号')
             ->field($field)

application/api/controller/WorkOrderSpotCheck.php

@@ -2586,8 +2586,8 @@ class WorkOrderSpotCheck extends Api{
                 '关联号'   => $item['关联编号'],
                 '物料编号' => $item['物料编码'],
                 '物料名称' => $item['物料名称'],
-                '领用数量' => $Inventory['领用数量'] + $item['number'],
-                '库存数量' => $Inventory['库存数量'] - $item['number'],
+                '领用数量' => $Inventory['领用数量'] + (float)$item['number'],
+                '库存数量' => $Inventory['库存数量'] - (float)$item['number'],
                 '实际门幅' => $item['实际门幅'],
                 '单位'     => $item['单位'],
                 '状态'     => 1,
@@ -2702,8 +2702,8 @@ class WorkOrderSpotCheck extends Api{
                 '关联号'   => $item['关联编号'],
                 '物料编号' => $item['物料编码'],
                 '物料名称' => $item['物料名称'],
-                '入仓总量' => $Inventory['入仓总量'] + $item['number'],
-                '库存数量' => $Inventory['库存数量'] + $item['number'],
+                '入仓总量' => $Inventory['入仓总量'] + (float)$item['number'],
+                '库存数量' => $Inventory['库存数量'] + (float)$item['number'],
                 '实际门幅' => $item['实际门幅'],
                 '单位'     => $item['单位'],
                 '状态'     => 1,
@@ -2946,11 +2946,11 @@ class WorkOrderSpotCheck extends Api{
 
             // 根据类型调整库存
             if ($item['type'] === '退面料') {
-                $returnQuantity = $number['退还数量'] + (int)$item['number'];
-                $stockQuantity  = $number['库存数量'] + (int)$item['number'];
+                $returnQuantity = $number['退还数量'] + (float)$item['number'];
+                $stockQuantity  = $number['库存数量'] + (float)$item['number'];
             } elseif ($item['type'] === '退厂商') {
                 $returnQuantity = $item['number'];
-                $stockQuantity = $number['库存数量'] - (int)$item['number'];
+                $stockQuantity = $number['库存数量'] - (float)$item['number'];
             }else{
                 $returnQuantity = $number['退还数量'];
                 $stockQuantity = $number['库存数量'];