fyy

app/Service/FyyOrderService.php

@@ -352,10 +352,12 @@ class FyyOrderService extends Service
                         'cdlcode' => $value['cdlcode'],
                         'product_no' => $value['cinvcode'],
                         'product_title' => $value['product_title'],
-                        'technology_name' => $cfree1,
-                        'wood_name' => $cfree2,
+                        'technology_name' => $cfree1 ?? '',
+                        'wood_name' => $cfree2 ?? '',
                         'num' => $n,
-                        'technology_material' => $value['technology_material']
+                        'technology_material' => $value['technology_material'] ?? '',
+                        'process_mark' => $value['process_mark'] ?? '',
+                        'product_size' => $value['product_size'] ?? ''
                     ];
                 }
 

app/Service/FyySqlServerService.php

@@ -535,6 +535,7 @@ class FyySqlServerService extends Service
     public function getDataFromDispatchList($data){
         $model = $this->db->table('DispatchList as a')
             ->leftJoin('DispatchLists as b','b.DLID','a.DLID')
+            ->leftJoin('Inventory as c','c.cInvCode','b.cInvCode')
             ->whereNotNull('a.cVerifier')
             ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity');
 
@@ -545,7 +546,7 @@ class FyySqlServerService extends Service
         }
         if(! empty($data['order_no'])) $model->where('a.cSOcode',$data['order_no']);
 
-        $message = $model->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','a.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','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')
+        $message = $model->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','a.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','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')
             ->get()->toArray();
 
         if(! empty($message)){