fyy

app/Service/Box/BoxService.php

@@ -640,6 +640,8 @@ class BoxService extends Service
                 'ext_7' => $value['cuscode'] ?? "",
                 'ext_8' => $value['product_title'],
                 'ext_9' => $value['product_size'],
+                'ext_10' => $value['table_header_mark'],
+                'ext_11' => $value['table_body_mark'],
                 'top_id' => $value['idlsid'],
                 'state' => 0,
                 'num' => $value['submit_quantity'],
@@ -657,7 +659,7 @@ class BoxService extends Service
 
         $result = DB::table('box_detail')->where('del_time',0)
             ->where('top_id',$data['idlsid'])
-            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5')
+            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','ext_10','ext_11')
             ->get()->toArray();
         if(! empty($result)){
             foreach ($result as $key => $value){
@@ -703,7 +705,7 @@ class BoxService extends Service
 
         $result = DB::table('box_detail')->where('del_time',0)
             ->whereIn('order_no',$data['order_no'])
-            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','shipment_order_no','crt_time','team_id')
+            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','shipment_order_no','crt_time','team_id','ext_10','ext_11')
             ->get()->toArray();
         if(! empty($result)){
             foreach ($result as $key => $value){

app/Service/FyySqlServerService.php

@@ -599,7 +599,7 @@ class FyySqlServerService extends Service
         $model = $this->db->table('DispatchList as a')
             ->leftJoin('DispatchLists as b','b.DLID','a.DLID')
             ->leftJoin('Inventory as c','c.cInvCode','b.cInvCode')
-            ->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','b.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','a.dDate as date','b.iDLsID as idlsid','b.cWhCode as cwhcode','b.cInvCode as cinvcode','b.cInvName as product_title','b.cFree1 as cfree1','b.cFree2 as cfree2','b.cPosition as cposition','b.cBatch as cbatch','b.iQuantity as iquantity','b.iNum as inum','b.iInvExchRate as iinvexchrate','b.fOutQuantity as out_quantity','b.iUnitPrice as iunitcost','b.iMoney as imoney','b.cDefine28 as technology_material','b.cDefine30 as process_mark','c.cInvStd as product_size',DB::raw('(b.iQuantity - b.fOutQuantity) as quantity'))
+            ->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','b.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','a.dDate as date','b.iDLsID as idlsid','b.cWhCode as cwhcode','b.cInvCode as cinvcode','b.cInvName as product_title','b.cFree1 as cfree1','b.cFree2 as cfree2','b.cPosition as cposition','b.cBatch as cbatch','b.iQuantity as iquantity','b.iNum as inum','b.iInvExchRate as iinvexchrate','b.fOutQuantity as out_quantity','b.iUnitPrice as iunitcost','b.iMoney as imoney','b.cDefine28 as technology_material','b.cDefine30 as process_mark','c.cInvStd as product_size',DB::raw('(b.iQuantity - b.fOutQuantity) as quantity'),'a.cMemo as table_header_mark','b.cMemo as table_body_mark')
             ->whereNotNull('a.cVerifier')
             ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity')
             ->where('a.dDate','>=',$data['time'][0])