新建调拨申请优化

app/admin/controller/Allot.php

@@ -122,22 +122,29 @@ class Allot extends BaseController
     if($wsm_in==""){
         return error_show(1002,"入库仓库不能为空");
     }
-        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !=="" ? trim($this->post['in_companyNo']) :"";
-        if($in_companyNo==""){
-            return error_show(1002,"in_companyNo不能为空");
-        }
-        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !=="" ? trim($this->post['out_companyNo']) :"";
-        if($out_companyNo==""){
-            return error_show(1002,"out_companyNo不能为空");
-        }
-        $company =Db::name("business")->where(['companyNo'=>$in_companyNo,"is_del"=>0])->find();
-        if($company==false){
-            return error_show(1002,"未找到入库业务公司");
-        }
-        $company =Db::name("business")->where(['companyNo'=>$out_companyNo,"is_del"=>0])->find();
-        if($company==false){
-            return error_show(1002,"未找到出库业务公司");
-        }
+
+        //根据出入库的仓库编码，查出对应的公司、业务公司
+        $warehouse_temp_info = Db::name('warehouse_info')
+            ->where(['is_del' => 0, 'status' => 1])
+            ->whereIn('wsm_code', [$wsm_out, $wsm_in])
+            ->column('supplierNo,companyNo', 'wsm_code');//supplierNo所属供货商，companyNo业务企业
+
+//        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !=="" ? trim($this->post['in_companyNo']) :"";
+//        if($in_companyNo==""){
+//            return error_show(1002,"in_companyNo不能为空");
+//        }
+//        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !=="" ? trim($this->post['out_companyNo']) :"";
+//        if($out_companyNo==""){
+//            return error_show(1002,"out_companyNo不能为空");
+//        }
+//        $company =Db::name("business")->where(['companyNo'=>$in_companyNo,"is_del"=>0])->find();
+//        if($company==false){
+//            return error_show(1002,"未找到入库业务公司");
+//        }
+//        $company =Db::name("business")->where(['companyNo'=>$out_companyNo,"is_del"=>0])->find();
+//        if($company==false){
+//            return error_show(1002,"未找到出库业务公司");
+//        }
 //    $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code'] !=="" ? trim($this->post['good_type_code']) :"";
 //    if($good_type_code==""){
 //        return error_show(1002,"商品属性不能为空");
@@ -171,8 +178,8 @@ class Allot extends BaseController
                 "allot_code"=>$allot_code,
                 "wsm_out"=>$wsm_out,
                 "wsm_in"=>$wsm_in,
-                "out_companyNo"=>$out_companyNo,
-                "in_companyNo"=>$in_companyNo,
+                "out_companyNo"=>$warehouse_temp_info[$wsm_out]['companyNo'],
+                "in_companyNo"=>$warehouse_temp_info[$wsm_in]['companyNo'],
                 "apply_name"=>$ri,
                 "apply_id"=>$rm,
                 "post_name"=>$post_name,
@@ -206,7 +213,7 @@ class Allot extends BaseController
                         $temp = [];
                         $temp['good_name'] = $st['good_name'];
                         $temp['allot_code'] =$allot_code;
-                        $temp['good_type_code'] = $value['good_code'];
+                        $temp['good_type_code'] = $value['spuCode'];
                         $temp['allot_num'] = $value['allot_num'];
                         $temp['usable_num'] = 0;
                         $temp['error_num'] = 0;