发货单收货申请单细节优化

app/admin/controller/After.php

@@ -600,6 +600,7 @@ class After extends Base
                         if (empty($sale)) throw new Exception('未找到销售单数据');
 
                         $od_status = $orde['status'];
+                        $orde['send_status'] = 5;
                         $orde['status'] = 4;
                         $orde['updatetime'] = $date;
                         $out = Db::name("order_out")->save($orde);

app/admin/controller/OrderOutChild.php

@@ -381,7 +381,7 @@ class OrderOutChild extends Base
 
             Db::rollback();
 
-            return json_show(1004, $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
+            return json_show(1004, $exception->getMessage());
         }
 
     }

app/admin/controller/Sale.php

@@ -3420,6 +3420,10 @@ class Sale extends Base
         if ($status !== "") {
             $where[] = ['a.status', "=", $status];
         }
+        $send_status = isset($this->post['send_status']) && $this->post['send_status'] !== "" ? trim($this->post['send_status']) : "";
+        if ($send_status !== "") {
+            $where[] = ['a.send_status', "=", $send_status];
+        }
         $start = isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start'] : "";
         if ($start != "") {
             $where[] = ["a.addtime", '>=', $start . " 00:00:00"];
@@ -3542,7 +3546,7 @@ class Sale extends Base
         $all_createrid = array_column($list, 'apply_id');
         $item = get_company_name_by_uid($all_createrid);
         $user = new \app\admin\common\User();
-        $names = $user->handle("getCodeAndName", ["code" => array_merge( array_column($list, "customer_code"), array_column($list, "wsm_supplierNo"))]);
+        $names = $user->handle("getCodeAndName", ["code" => array_merge( array_column($list, "supplierNo"), array_column($list, "wsm_supplierNo"))]);
 
 //        $userCommon = new \app\admin\common\User();
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_column($list,'customer_code')]);