提交

app/Model/InventoryOrder.php

@@ -10,13 +10,13 @@ class InventoryOrder extends Model
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
-    const STATE_ZERO = 0;//未审核
-    const STATE_ONE = 1;//审核通过
+    const STATE_ZERO = 0;//未盘点
+    const STATE_ONE = 1;//盘点中
     const STATE_TWO = 2;//盘点结束
     const prefix = 'PD';
     public static $name = [
-        0 => '未审核',
-        1 => '审核通过',
+        0 => '未盘点',
+        1 => '盘点中',
         2 => '盘点结束'
     ];
 }

app/Service/InventoryService.php

@@ -187,22 +187,10 @@ class InventoryService extends Service
     public function fillListData($data){
         if(empty($data['data'])) return $data;
 
-        $asset = InventoryOrderAsset::where('del_time',0)
-            ->whereIn('order_no',array_column($data['data'],'order_no'))
-            ->select('order_no','state')
-            ->get()->toArray();
-        $map = [];
-        foreach ($asset as $value){
-            if(! isset($map[$value['order_no']]) && $value['state'] > InventoryOrderAsset::STATE_ZERO)  $map[$value['order_no']] = 1;
-        }
-
         $emp_map = Employee::whereIn('id',array_column($data['data'],'crt_id'))->pluck('emp_name','id')->toArray();
 
         date_default_timezone_set('PRC');
         foreach ($data['data'] as $key => $value){
-            $is_edit = 1;
-            if(isset($map[$value['order_no']])) $is_edit = 0;
-            $data['data'][$key]['is_edit'] = $is_edit;
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d",$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? '';
             if($value['inventory_time']) {
@@ -283,6 +271,10 @@ class InventoryService extends Service
 
         try {
             DB::beginTransaction();
+            InventoryOrder::where('order_no',$data['order_no'])->update([
+                'state' => InventoryOrder::STATE_ONE
+            ]);
+
             foreach ($data['data'] as $value){
                 InventoryOrderAsset::where('id',$value['id'])
                     ->where('del_time',0)
@@ -325,18 +317,17 @@ class InventoryService extends Service
 
         InventoryOrder::where('order_no',$data['order_no'])
             ->where('del_time',0)
-            ->update(['state' => $data['state']]);
+            ->update(['state' => InventoryOrder::STATE_TWO]);
 
         return [true,''];
     }
 
     public function updateOrderStateRule($data){
         if(empty($data['order_no'])) return [false,'盘点单单号不能为空'];
-        if(empty($data['state'])) return [false,'盘点单状态不能为空'];
 
         $bool = InventoryOrder::where('order_no',$data['order_no'])
             ->where('del_time',0)
-            ->where('state','>',InventoryOrder::STATE_ZERO)
+            ->where('state',InventoryOrder::STATE_TWO)
             ->exists();
         if($bool) return [false,'请确认盘点单的状态,操作失败！'];