Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/After.php

@@ -604,25 +604,25 @@ class After extends Base
                     //退入次品仓，维护
                     $wsm = Db::name('warehouse_info')->where(['is_del' => 0, 'wsm_code' => $param['wsm_code']])->findOrEmpty();
                     if (empty($wsm)) throw new Exception('返回仓库不存在');
+                    if ($wsm['wsm_type'] != 4) throw new Exception('不是次品仓');
+
+//                    if ($wsm['wsm_type'] == 4) {
+                    Db::name('order_returninfo')->insert([
+                        'returnCode' => $param['returnCode'],
+                        'return_wsm' => $param['wsm_code'],
+                        'contactor' => $wsm['contactor_name'],
+                        'mobile' => $wsm['mobile'],
+                        'addr' => $wsm['addr'],
+                        'addr_code' => $wsm['addrs_code'],
+                        'post_code' => '',
+                        'post_company' => '',
+                        'post_fee' => 0,
+                        'gys_remark' => '',
+                        'addtime' => $date,
+                    ]);
+//                    }
 
-                    if ($wsm['wsm_type'] == 4) {
-                        Db::name('order_returninfo')->insert([
-                            'returnCode' => $param['returnCode'],
-                            'return_wsm' => $param['wsm_code'],
-                            'contactor' => $wsm['contactor_name'],
-                            'mobile' => $wsm['mobile'],
-                            'addr' => $wsm['addr'],
-                            'addr_code' => $wsm['addrs_code'],
-                            'post_code' => '',
-                            'post_company' => '',
-                            'post_fee' => 0,
-                            'gys_remark' => '',
-                            'addtime' => $date,
-                        ]);
-                    }
-
-                }
-                else $info['return_tag'] = 1;
+                } else $info['return_tag'] = 1;
 
                 $var = $info['status'];
                 $info['status'] = $param['status'];

app/admin/controller/AfterChild.php

@@ -63,7 +63,7 @@ class AfterChild extends Base
             ->count('a.id');
 
         $list = $db
-            ->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,d.order_type,d.apply_id,d.apply_name,a.type,a.can_sell_num,a.defective_num,a.loss_num')
+            ->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,d.order_type,d.apply_id,d.apply_name,a.type,a.can_sell_num,a.defective_num,a.loss_num,a.return_num_total')
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->select()
@@ -253,7 +253,12 @@ class AfterChild extends Base
                         'updatetime' => $date,
                         'return_wsm_code' => Db::name('order_returninfo')->where('returnCode', $param['returnCode'])->value('return_wsm', ''),//取之前次品仓的编码
                         'type' => 2,
-                        'return_num_total' => $temp['defective_num']
+                        'return_num_total' => $value['defective_num'],
+                        'can_sell_num' => $value['can_sell_num'],
+                        'defective_num' => $value['defective_num'],
+                        'loss_num' => $value['loss_num'],
+                        'remark' => $value['remark'] ?? '',
+                        'status' => 2,
                     ]);
                 }