cqpCow 2 years ago
parent
commit
56d606dc0f
2 changed files with 15 additions and 15 deletions
  1. 14 14
      app/Service/CheckService.php
  2. 1 1
      app/Service/InventoryService.php

+ 14 - 14
app/Service/CheckService.php

@@ -64,19 +64,19 @@ class CheckService extends Service
 
     //对应具体单子的具体操作数值(将待审批改为通过或者未审批)
     public static $opt_case = [
-        self::one => 'check_material_order_apply', //领料单申领区域审批
-        self::two => 'check_material_order_send', //领料单发货区域审批
-        self::three => 'check_material_order_take', //领料单收货区域审批
-        self::four => 'check_material_order_In', //领料单入库区域审批 审批通过后有入库流水
-        self::five => 'check_construction', //施工单审核  审批通过后有出库流水
-        self::six => 'check_material_return', //退料单审核  审批通过后有出库流水
-        self::seven => 'check_transfer_sub', //调拨单详情审核
-        self::eight => 'check_transfer_in_sub', //调拨单入库审核  审批通过后有入库流水
-        self::nine => 'check_transfer_out_sub', //调拨单出库审核  审批通过后有出库流水
-        self::ten => 'check_inventory_sub', //盘点单详情审核
-        self::eleven => 'check_inventory_in_sub', //盘点单入库审核   审批通过后有入库流水
-        self::twl => 'check_inventory_out_sub', //盘点单出库审核  审批通过后有出库流水
-        self::thirteen => 'check_material_charge', //计费领料单审核
+        self::one => 'check_material_order_apply',
+        self::two => 'check_material_order_send',
+        self::three => 'check_material_order_take',
+        self::four => 'check_material_order_In',
+        self::five => 'check_construction',
+        self::six => 'check_material_return',
+        self::seven => 'check_transfer_sub',
+        self::eight => 'check_transfer_in_sub',
+        self::nine => 'check_transfer_out_sub',
+        self::ten => 'check_inventory_sub',
+        self::eleven => 'check_inventory_in_sub',
+        self::twl => 'check_inventory_out_sub',
+        self::thirteen => 'check_material_charge',
     ];
 
     //单子审批通过后产生流水
@@ -93,7 +93,7 @@ class CheckService extends Service
     //将状态改为待审核
     public static $opt_case2 = [
         self::one => 'set_status_to_one',
-        self::two => '',
+        self::two => 'set_status_to_two',
         self::three => '',
         self::four => '',
         self::five => '',

+ 1 - 1
app/Service/InventoryService.php

@@ -41,7 +41,7 @@ class InventoryService extends Service
      */
     public function changeInventory($data){
         $result = InOutRecord::where('del_time',0)
-            ->where('from_order_number',$data['order_number'])
+            ->where('order_number',$data['order_number'])
             ->select('storehouse_id',DB::raw("sum(number) as number"),'goods_id')
             ->groupby('goods_id','storehouse_id')
             ->get()->toArray();