Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/OrderOutChild.php

@@ -271,7 +271,7 @@ class OrderOutChild extends Base
             a.orderCode 销售订单编号,
             d.platform_order 平台订单号,
             "" 供应商端,
-            case a.status when 1 then "待发货" when 2 then "发货完成" when 3 then "已收货" when 4 then "已全部退货" end "状态" ,
+            case a.status when 1 then "待发货" when 2 then "发货完成" when 3 then "已收货" when 4 then "已全部退货" when 5 then "已取消" when 6 then "快递查询已签收" end "状态" ,
             case a.order_type when 1 then "备库" when 2 then "非库存" when 3 then "咨询商品" when 4 then "报备商品" end "商品类型",
             case a.order_source when 1 then "直接下单" when 2 then "咨询" when 3 then "项目" when 4 then "平台" when 5 then "有赞" when 6 then "售后补换货" when 7 then "报备转单" when 8 then "支付渠道" end "订单来源",
             a.num 总数量,a.wsm_code 仓库编号,

app/admin/controller/Sale.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ConsultBids;
 use app\admin\model\ConsultTemp;
 use app\admin\model\DataGroup as DataGroupModel;
 use app\admin\model\GoodLog;
@@ -2431,6 +2432,7 @@ class Sale extends Base
             $value['send_num'] -= $value['th_num'];
             $value['total_price'] = round($value['total_price'] - $value['th_fee'], 2);
             $value['company_name'] = $item[$value['apply_id']]??'';
+            $value['infoNo'] = ConsultBids::where("bidNo",$value['zxNo'])->value("infoNo","");
 
             //是否具有编辑权限
             $value['is_allow_update'] = 0;

app/admin/controller/User.php

@@ -782,7 +782,7 @@ class User extends Base
          * //            D
          * //            return app_show(0,"{$message}成功");
          * //        }
-         * **/
+         //**/
 
         $post = $this->request->only(["id", "status"], "post", 'trim');
         $validate = Validate::rule([
@@ -823,8 +823,6 @@ class User extends Base
         if (!empty($st)) {
             foreach ($st as $itom) {
                 $tep = [];
-//                $business = Db::name('business')->where(['id' => $itom['businessid'], "is_del" => 0])->field("company,companyNo")->find();
-
                 //这个地方是根据业务企业id来匹配的，无法去sys_user查找
                 $tep['company'] = '';//isset($business['company']) ? $business['company'] : "";
                 $tep['companyNo'] = '';//isset($business['companyNo']) ? $business['companyNo'] : "";