售后申请单流程有变，售后工单列表和详情加字段

app/admin/controller/After.php

@@ -513,7 +513,8 @@ class After extends Base
 
             switch ($info['status']) {
                 case 1:
-                    if (in_array($param['status'], [6, 9]) == false) throw new Exception('选项错误');
+                    if (in_array($param['status'], [6, 2, 9]) == false) throw new Exception('选项错误');
+                    if ($info['order_type'] == 1 && $param['status'] != 2) throw new Exception('选项错误');//库存品不允许供应商审核，只允许走2-11-4-12-5流程
                     break;
                 case 9:
                     if ((($info['is_receive'] == 1) && (in_array($param['status'], [2, 4]) == false) || (($info['is_receive'] == 0) && (in_array($param['status'], [2, 5]) == false)))) throw new Exception('选项错误');
@@ -530,6 +531,7 @@ class After extends Base
                 case 2:
 
                     if ((($info['is_receive'] == 1) && (in_array($param['status'], [10, 11]) == false) || (($info['is_receive'] == 0) && (in_array($param['status'], [10, 5]) == false)))) throw new Exception('选项错误');
+                    if ($info['order_type'] == 1 && $param['status'] != 11) throw new Exception('选项错误');//库存品不允许供应商审核，只允许走2-11-4-12-5流程
 
                     break;
                 case 10:

app/admin/controller/AfterChild.php

@@ -26,14 +26,16 @@ class AfterChild extends Base
             ->alias('a')
             ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where($where)
             ->count('a.id');
 
         $list = Db::name('order_return_child')
             ->alias('a')
-            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status')
+            ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name')
             ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
             ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where($where)
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
@@ -539,6 +541,10 @@ class AfterChild extends Base
 
         $info = Db::name('order_return_child')
             ->alias('a')
+            ->field('a.*,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,d.companyNo,d.companyName,d.customer_code,d.customer_name')
+            ->leftJoin('warehouse_info b', 'b.wsm_code=a.send_wsm_code')
+            ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code')
+            ->leftJoin('order_return d','d.returnCode=a.returnCode and d.is_del=0')
             ->where(['a.is_del' => 0, 'a.id' => $param['id']])
             ->findOrEmpty();
 

app/admin/controller/ReorderChild.php

@@ -129,12 +129,15 @@ class ReorderChild extends Base
 
         $count = Db::name('sale_return_child')
             ->alias('a')
-            ->where($where)
+            ->leftJoin('sale_return b','b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.return_wsm_code and c.is_del=0') ->where($where)
             ->count('a.id');
 
         $list = Db::name('sale_return_child')
             ->alias('a')
-            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime')
+            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime,b.supplierNo,b.supplierName,a.return_wsm_code,c.name return_wsm_name')
+            ->leftJoin('sale_return b','b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c','c.wsm_code=a.return_wsm_code and c.is_del=0')
             ->where($where)
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
@@ -334,7 +337,11 @@ class ReorderChild extends Base
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
         $info = Db::name('sale_return_child')
-            ->where(['is_del' => 0, 'id' => $param['id']])
+            ->alias('a')
+            ->field('a.*,b.supplierNo,b.supplierName,c.name return_wsm_name')
+            ->leftJoin('sale_return b', 'b.returnCode=a.returnCode and b.is_del=0')
+            ->leftJoin('warehouse_info c', 'c.wsm_code=a.return_wsm_code and c.is_del=0')
+            ->where(['a.is_del' => 0, 'a.id' => $param['id']])
             ->findOrEmpty();
 
         return empty($info) ? json_show(1004, '该退货工单不存在') : json_show(0, '获取退货工单详情成功', $info);