fyy

.idea/workspace.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="fyy">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/FyyOrderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/FyyOrderController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/Box/BoxHookService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/Box/BoxHookService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/Box/BoxService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/Box/BoxService.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Service/FyyOrderService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/FyyOrderService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/FyySqlServerService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/FyySqlServerService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -134,16 +136,11 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "node.js.selected.package.tslint": "(autodetect)"
+  }
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Http\Controllers\Api" />
@@ -276,7 +273,14 @@
       <option name="project" value="LOCAL" />
       <updated>1691495150166</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="fyy">
+      <created>1695118669269</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1695118669269</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -319,15 +323,6 @@
           </properties>
           <option name="timeStamp" value="5" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="php-line-method">
-          <url>file://$PROJECT_DIR$/app/Service/FyyOrderService.php</url>
-          <line>98</line>
-          <properties>
-            <option name="className" value="\App\Service\FyyOrderService" />
-            <option name="methodName" value="orderList" />
-          </properties>
-          <option name="timeStamp" value="7" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="php">
           <url>file://$PROJECT_DIR$/routes/api.php</url>
           <line>21</line>

app/Service/Box/BoxHookService.php

@@ -190,7 +190,7 @@ class BoxHookService extends Service
         if(empty($box)) return [];
         $boxDetail = new BoxDetail(['channel'=>$box->top_order_no]);
 //        $list = [];
-        $list = $boxDetail->where('order_no',$order_no)->where('del_time',0)->select('id','top_id','num')->get()->toArray();
+        $list = $boxDetail->where('order_no',$order_no)->where('del_time',0)->select('id','top_id','num','ext_1','ext_2','ext_3','ext_4','ext_5','out_order_no','box_type')->get()->toArray();
 
         $boxDetail->where('order_no',$order_no)->where('del_time',0)->update([
             'del_time' => time()

app/Service/Box/BoxService.php

@@ -128,7 +128,7 @@ class BoxService extends Service
                         'ext_4' => $ext_4,
                         'ext_5' => $ext_5,
                         'num' => $vv,
-                        'box_type' => 0,
+                        'box_type' => 1,
                         'team_id' => $team_id,
                         'shipment_order_no' => $transport_no,
 
@@ -148,13 +148,17 @@ class BoxService extends Service
 
             }
             foreach ($sale_product_list as $v) {
-                if($v['id'] < 0)  $v['id'] = -$v['id'];
+                $box_type = 0;
+                if($v['id'] < 0)  {
+                    $v['id'] = -$v['id'];
+                    $box_type = 1;
+                }
                 $num_list = $key_list[$v['id']];
                 $total = $num_list['total'];
                 $detail = $num_list['detail'];
                 $team_id = $num_list['team_id'];
                 $box_detail = new BoxDetail(['channel'=>$top_order_no]);
-                $un_box_num = $v['order_quantity'] - $v['box_num'] - $box_detail->where('top_id',$v['id'])->where('box_type',1)->sum('num');
+                $un_box_num = $v['order_quantity'] - $v['box_num'] - $box_detail->where('top_id',$v['id'])->where('del_time',0)->where('box_type',1)->sum('num');
                 if ($total > $un_box_num) return [false, $v['product_title'] . '数量不足'];
 
                 $ext_1 = $v['product_no'];//产品编号
@@ -174,7 +178,7 @@ class BoxService extends Service
                         'ext_4' => $ext_4,
                         'ext_5' => $ext_5,
                         'num' => $vv,
-                        'box_type' => 1,
+                        'box_type' => $box_type,
                         'team_id' => $team_id,
                         'shipment_order_no' => $transport_no,
 
@@ -493,7 +497,7 @@ class BoxService extends Service
         if(isset($data['transport_no'])&&!empty($data['transport_no'])) $list = $list->wherein('shipment_order_no',$data['transport_no']);
 //        if(isset($data['top_order_no'])) $list = $list->wherein('top_order_no',$data['top_order_no']);
 //        if(isset($data['transport_no'])) $list = $list->wherein('shipment_order_no',$data['transport_no']);
-        $list = $list->select('top_order_no','order_no','crt_time')->get()->toArray();
+        $list = $list->select('top_order_no','order_no','crt_time')->where('del_time',0)->groupBy('order_no')->get()->toArray();
 
 
         return [true,$list];
@@ -531,6 +535,7 @@ class BoxService extends Service
             $detail = $sale_orders_key_product[$v['top_id']];
 //            var_dump($detail);die;
             $v['customer_name'] = $detail['customer_name'];
+            $v['table_body_mark'] = $detail['table_body_mark'];
             $v['ext_4'] = $detail['product_title'];
             $v['ext_5'] = $detail['product_size'];
             $v['customer_name'] = $detail['customer_name'];
@@ -548,7 +553,7 @@ class BoxService extends Service
         if(!isset($data['top_order_no'])&&!isset($data['transport_no'])) return [false,'销售单或发货单必选一个'];
         if(isset($data['top_order_no'])&&!empty($data['top_order_no'])) $list = $list->wherein('top_order_no',$data['top_order_no']);
         if(isset($data['transport_no'])&&!empty($data['transport_no'])) $list = $list->wherein('shipment_order_no',$data['transport_no']);
-        $list = $list->select('top_order_no','order_no','crt_time')->get()->toArray();
+        $list = $list->select('top_order_no','order_no','crt_time')->where('del_time',0)->get()->toArray();
 
 
         return [true,$list];
@@ -569,6 +574,18 @@ class BoxService extends Service
                 SaleOrdersProduct::where('id',$vv['top_id'])->update([
                     'box_num' => DB::raw('box_num - '.$vv['num'])
                 ]);
+                if($vv['box_type'] == 1){
+                    //   $ext_1 = $v['product_no'];//产品编号
+                    //                $ext_2 = $v['technology_material']; //工艺材质
+                    //                $ext_3 = $v['technology_name'];//工艺名称
+                    //                $ext_4 = $v['wood_name'];//木皮
+                    //                $ext_5 = $v['process_mark'];//工艺备注
+                    OrdersProduct::where('product_no',$vv['ext_1'])->where('technology_material',$vv['ext_2'])->where('technology_name',$vv['ext_3'])->where('wood_name',$vv['ext_4'])->where('process_mark',$vv['ext_5'])->where('sale_orders_product_id',$vv['top_id'])
+                        ->update([
+                            'box_num' => DB::raw('box_num - '.$vv['num'])
+                        ]);
+
+                }
             }
         }
 

app/Service/FyyOrderService.php

@@ -116,15 +116,8 @@ class FyyOrderService extends Service
         if(! empty($data['customer_name'])) $model->where('customer_name', 'LIKE', '%'.$data['customer_name'].'%');
         if(! empty($data['shipment_order_no'])) {
             //$data['product_no'].'_'.$data['technology_material'].'_'.$data['technology_name'].'_'.$data['wood_name'].'_'.$data['process_mark'];
-            $out_order_nos = Box::where('shipment_order_no','like','%'.$data['shipment_order_no'].'%')->select('*')->get()->toArray();
-            $model->where(function ($query) use($out_order_nos){
-                foreach ($out_order_nos as $v){
-                    $query->orwhere(function ($query) use ($v){
-                        $query->where('out_order_no',$v['out_order_no'])->where('product_no',$v['ext_1'])->where('technology_material',$v['ext_2'])->where('technology_name',$v['ext_3'])->where('wood_name',$v['ext_4'])->where('process_mark',$v['ext_5']);
-                    });
-                }
-
-            });
+            $top_order_nos = Box::where('shipment_order_no','like','%'.$data['shipment_order_no'].'%')->pluck('top_order_no')->toArray();
+            $model->wherein('order_no',$top_order_nos);
         }
         if(! empty($data['product_no'])) $model->where('product_no', 'LIKE', '%'.$data['product_no'].'%');
         if(! empty($data['product_title'])) $model->where('product_title', 'LIKE', '%'.$data['product_title'].'%');
@@ -158,30 +151,22 @@ class FyyOrderService extends Service
             $transport_nos = Box::wherein('out_order_no',$out_order_nos)->select('*')->get()->toArray();
             $transport_key_nos = [];
             foreach ($transport_nos as $v){
-                $key = $this->getBoxKey($v);
-                if(!isset($transport_key_nos[$key])) $transport_key_nos[$v['out_order_no']] = [];
-                $transport_key_nos[$key][] = $v['shipment_order_no'];
+                $key = $v['top_order_no'];
+                if(!isset($transport_key_nos[$key])) $transport_key_nos[$key] = [];
+                if(!empty($v['shipment_order_no'])) $transport_key_nos[$key][] = $v['shipment_order_no'];
             }
 
             foreach ($list['data'] as &$v){
-                $key = $this->getKey($v);
+                $key = $v['order_no'];
                 if(isset($transport_key_nos[$key])) $v['shipment_order_no'] = implode(',',$transport_key_nos[$key]);
 
-                $v['shipment_order_no'] = '';
+                else $v['shipment_order_no'] = '';
             }
         }
 
 
         return [true, $list];
     }
-    protected function getKey($data){
-
-        return $data['product_no'].'_'.$data['technology_material'].'_'.$data['technology_name'].'_'.$data['wood_name'].'_'.$data['process_mark'];
-    }
-    protected function getBoxKey($data){
-
-        return $data['ext_1'].'_'.$data['ext_2'].'_'.$data['ext_3'].'_'.$data['ext_4'].'_'.$data['ext_5'];
-    }
 
 
     public function fillData($data){