Merge branch 'master-new' into master-new-dev-wf

app/admin/controller/Allot.php

@@ -280,19 +280,19 @@ class Allot extends Base
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }
-        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('companyNo,wsm_code,name')->find();
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
-        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('companyNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
 		$user = new \app\admin\common\User();
-        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['supplierNo'],$st['supplierNo']]]);
+        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['companyNo'],$st['companyNo']]]);
 		if($supplie['code']!=0 || empty($supplie['data'])) return error_show(1001,"未找到供应商数据");
-		$vr = ["name"=>$supplie['data'][$stv['supplierNo']],"code"=>$stv['supplierNo']];
-		$var = ["name"=>$supplie['data'][$st['supplierNo']],"code"=>$st['supplierNo']];
+		$vr = ["name"=>$supplie['data'][$stv['companyNo']],"code"=>$stv['companyNo']];
+		$var = ["name"=>$supplie['data'][$st['companyNo']],"code"=>$st['companyNo']];
 //        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
 //        if(empty($vr)){
 //            return error_show(1001,"未找到供应商数据");

app/admin/controller/Check.php

@@ -634,7 +634,7 @@ public function __construct(App $app)
             return error_show(1002,"参数id不能为空");
         }
         $fo = Db::name('good_check')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_code","left")
-            ->field(",b.supplierNo as code,b.name,a.*")
+            ->field("b.supplierNo as code,b.name,a.*")
             ->where(['a.id'=>$id,'a.is_del'=>0])->find();
         if(empty($fo)){
             return error_show(1003,"未找到盘点信息");

app/admin/controller/Sale.php

@@ -241,7 +241,7 @@ class Sale extends Base
                 "status" => 0,
                 "send_num" => 0,
                 "wsend_num" => $good_num,
-                "send_status" => 0,
+                "send_status" => 1,
                 "good_type" => $goodtype,
                 "send_type" => $sendtype,
                 "supplierNo" => $supplierNo,