更新提交

server/app/Repositories/Transformers/Rhawn/OrdersDispatchTransformer.php

@@ -42,6 +42,7 @@ class OrdersDispatchTransformer extends TransformerAbstract
                     $dp['p_en_name'] = $detail['si_id']['p_en_name'];
                     $dp['p_cn_name'] = $detail['si_id']['p_cn_name'];
                     $dp['cas'] = $detail['si_id']['c_cas'];
+                    $dp['p_stock'] = $detail['si_id']['p_stock'];
 
                     $dpdTransReturn[$detail['dp_code']]['detail'][] = $dp;
                 }

server/app/Rhawn/Repositories/Eloquent/RhawnSoitemsRepositoryEloquent.php

@@ -86,7 +86,8 @@ class RhawnSoitemsRepositoryEloquent extends BaseRepository implements RhawnSoit
         //查询订单的详情
         $soModel = RhawnSoitems::query()
             ->join('products','soitems.p_id','products.p_id')
-            ->join('chemicals','chemicals.c_id','products.c_id');
+            ->join('chemicals','chemicals.c_id','products.c_id')
+            ->join('pstock','pstock.p_id','products.p_id');
         if(is_array($si_id)){
             $soModel->whereIn('soitems.si_id',$si_id);
         }else{