退货工单存储发货工单的状态

app/admin/controller/AfterChild.php

@@ -78,7 +78,7 @@ class AfterChild extends Base
         //发货工单详情
         $order_out_child = Db::name('order_out_child')
             ->where(['is_del' => 0, 'outCode' => $info['outCode'], 'outChildCode' => array_column($param['list'], 'outChildCode')])
-            ->column('num,wsm_code', 'outChildCode');
+            ->column('num,wsm_code,status', 'outChildCode');
 
         //所有仓库详情
         $wsm_info = Db::name('warehouse_info')
@@ -100,7 +100,7 @@ class AfterChild extends Base
                     'returnCode' => $param['returnCode'],
                     'orderCode' => $order_out['orderCode'],
                     'outCode' => $info['outCode'],
-                    'order_out_status' => $order_out['order_out_status'],
+                    'order_out_child_status' => $order_out_child[$value['outChildCode']]['status'],
                     'outChildCode' => $value['outChildCode'],
                     'send_wsm_code' => $order_out_child[$value['outChildCode']]['wsm_code'],
                     'send_num' => $order_out_child[$value['outChildCode']]['num'],

app/admin/controller/OrderOutChild.php

@@ -83,16 +83,14 @@ class OrderOutChild extends Base
 
         $count = Db::name('order_out_child')
             ->alias('a')
-            ->leftJoin('order_return b','b.returnCode=a.returnCode AND b.is_del=0')
-            ->leftJoin('warehouse_info c','c.wsm_code=a.send_wsm_code AND c.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.wsm_code AND c.is_del=0')
             ->where($where)
             ->count('a.id');
 
         $list = Db::name('order_out_child')
             ->alias('a')
-            ->field('a.*,b.order_out_status,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name')
-            ->leftJoin('order_return b','b.returnCode=a.returnCode AND b.is_del=0')
-            ->leftJoin('warehouse_info c','c.wsm_code=a.send_wsm_code AND c.is_del=0')
+            ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.wsm_code AND c.is_del=0')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->where($where)
@@ -408,7 +406,7 @@ class OrderOutChild extends Base
                 //send_status 3部分发货，4全部发货
                 Db::name('order_out')
                     ->where(['id' => $order_out[$child[$value['outChildCode']]['outCode']]['id']])
-                    ->update(['send_status' => $order_out[$child[$value['outChildCode']]['outCode']]['already_send_num'] >= $order_out[$child[$value['outChildCode']]['outCode']]['send_num'] ? 4 : 3, 'updatetime' => $date]);
+                    ->update(['send_status' => $order_out[$child[$value['outChildCode']]['outCode']]['already_send_num'] >= $order_out[$child[$value['outChildCode']]['outCode']]['send_num'] ? 4 : 3, 'status' => 2, 'updatetime' => $date]);
 
                 $sale[$child[$value['outChildCode']]['orderCode']]['send_num'] += $child[$value['outChildCode']]['num'];
                 $sale[$child[$value['outChildCode']]['orderCode']]['wsend_num'] -= $child[$value['outChildCode']]['num'];

app/admin/controller/Reorder.php

@@ -766,6 +766,8 @@ class Reorder extends Base
      * 9待供应商审核
      * 8供应商已驳回待采购审核
      * 10业务公司修改待供应商确认
+     * 11待设置退货工单
+     * 12待库管发货
      */
     public function exam()
     {