1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/InventoryService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/InventoryService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/CheckService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/CheckService.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -153,7 +153,7 @@
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
       <workItem from="1686021203384" duration="14595000" />
-      <workItem from="1686099374239" duration="2870000" />
+      <workItem from="1686099374239" duration="3270000" />
     </task>
     <servers />
   </component>

app/Service/CheckService.php

@@ -81,46 +81,34 @@ class CheckService extends Service
 
     //单子审批通过后产生流水
     public static $record = [
-        self::four => 'record_material_order_In', //领料单入库区域审批 审批通过后有入库流水
-        self::five => 'record_construction', //施工单审核  审批通过后有出库流水
-        self::six => 'record_material_return', //退料单审核  审批通过后有出库流水
-        self::eight => 'record_transfer_in_sub', //调拨单入库审核  审批通过后有入库流水
-        self::nine => 'record_transfer_out_sub', //调拨单出库审核  审批通过后有出库流水
-        self::eleven => 'record_inventory_in_sub', //盘点单入库审核   审批通过后有入库流水
-        self::twl => 'record_inventory_out_sub', //盘点单出库审核  审批通过后有出库流水
+        self::four => 'record_material_order_In',
+        self::five => 'record_construction',
+        self::six => 'record_material_return',
+        self::eight => 'record_transfer_in_sub',
+        self::nine => 'record_transfer_out_sub',
+        self::eleven => 'record_inventory_in_sub',
+        self::twl => 'record_inventory_out_sub',
     ];
 
     //将状态改为待审核
     public static $opt_case2 = [
-        self::one => 'set_check_material_order_apply', //领料单申领区域审批
-        self::two => 'set_check_material_order_send', //领料单发货区域审批
-        self::three => 'set_check_material_order_take', //领料单收货区域审批
-        self::four => 'set_check_material_order_In', //领料单入库区域审批 审批通过后有入库流水
-        self::five => 'set_check_construction', //施工单审核  审批通过后有出库流水
-        self::six => 'set_check_material_return', //退料单审核  审批通过后有出库流水
-        self::seven => 'set_check_transfer_sub', //调拨单详情审核
-        self::eight => 'set_check_transfer_in_sub', //调拨单入库审核  审批通过后有入库流水
-        self::nine => 'set_check_transfer_out_sub', //调拨单出库审核  审批通过后有出库流水
-        self::ten => 'set_check_inventory_sub', //盘点单详情审核
-        self::eleven => 'set_check_inventory_in_sub', //盘点单入库审核   审批通过后有入库流水
-        self::twl => 'set_check_inventory_out_sub', //盘点单出库审核  审批通过后有出库流水
-        self::thirteen => 'set_check_material_charge', //计费领料单审核
-    ];
-
-    public static $opt_case3 = [
-        self::five => 'create_warranty', //施工单审核 审批产生质保单
+        self::one => 'set_status_to_one',
+        self::two => '',
+        self::three => '',
+        self::four => '',
+        self::five => '',
+        self::six => '',
+        self::seven => '',
+        self::eight => '',
+        self::nine => '',
+        self::ten => '',
+        self::eleven => '',
+        self::twl => '',
+        self::thirteen => '',
     ];
 
     //将状态改为待审核
     public function set_status_to_one($data){
-        $modelOne = MaterialOrder::where('order_number',$data['order_number'])->where('del_time',0)->first();
-
-        //待审
-        if($modelOne->apply_status >= MaterialOrder::STATE_ONE) return [false,'已待审或审核通过,操作失败！'];
-
-        $modelOne->apply_status = MaterialOrder::STATE_ONE;
-        $modelOne->save();
-
         return [true,''];
     }
 
@@ -134,7 +122,6 @@ class CheckService extends Service
         //具体方法
         $function = self::$opt_case2[$data['opt_case']];
 
-        $function2 = self::$opt_case3[$data['opt_case']] ?? '';
         try{
             DB::beginTransaction();
 
@@ -146,10 +133,6 @@ class CheckService extends Service
                 return [false, $msg];
             }
 
-            if($function2){
-                $this->$function2($data,$user);
-            }
-
             //创建审批流
             $args = [
                 'order_no' => $data['order_number'],
@@ -191,7 +174,7 @@ class CheckService extends Service
      * opt_case 具体审核类型 已定义同名静态变量
      */
     public function createRecordAndInventory($data = []){
-        if(empty($data['order_number']) || empty($data['type']) || empty($data['opt_case']) || ! isset(self::$opt_case[$data['opt_case']])) return [false,config('response.FAILED')];
+        if(empty($data['order_number']) || empty($data['type']) || empty($data['opt_case']) || ! isset(self::$opt_case[$data['opt_case']])) return [false,300];
 
         //具体方法
         $function = self::$opt_case[$data['opt_case']];
@@ -210,23 +193,23 @@ class CheckService extends Service
 
                 if(! $boolean) { //创建流水失败 数据库回滚
                     DB::rollBack();
-                    return [false, config('response.FAILED')];
+                    return [false, 300];
                 }
 
                 //更新库存
-                $inventy = new InventoryService();
-                $boole = $inventy->changeInventory($data);
+                $inventory = new InventoryService();
+                $boole = $inventory->changeInventory($data);
                 if(! $boole){
                     DB::rollBack();
-                    return [false, config('response.FAILED')];
+                    return [false, 300];
                 }
             }
 
             DB::commit();
-            return [true, config('response.SUCCESS')];
+            return [true, 200];
         }catch (\Throwable $exception){
             DB::rollBack();
-            return [false, config('response.FAILED')];
+            return [false, 201];
         }
     }
 }