ad

app/admin/controller/Allot.php

@@ -256,7 +256,7 @@ class Allot extends BaseController
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }
-        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],"wsm_type"=>1,'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
@@ -264,7 +264,7 @@ class Allot extends BaseController
         if(empty($vr)){
             return error_show(1001,"未找到供应商数据");
         }
-        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],"wsm_type"=>1,'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
@@ -359,12 +359,9 @@ class Allot extends BaseController
                 $order = ["order_code"=>$etid['allot_code'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$order,"DBD",$etid['status'],$this->post);
                 foreach ($dain as $value) {
-                    $st =Db::name("good")->alias("b")
-                        ->join("good_stock c", "c.spuCode = b.spuCode", "left")
-                        ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
-                        ->join("supplier n","n.code=v.supplierNo","left")
-                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
-                        ->field("b.spuCode,b.good_name,b.good_unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
+                    $st = Db::name("good_stock")->alias("a")->leftJoin("good b" ,"a.spuCode=b.spuCode")
+                        ->where(['wsm_code' => $wsm_out, 'a.spuCode' => $value['spuCode'], 'a.is_del' => 0])
+                        ->field("a.spuCode,wsm_code,usable_stock,wait_out_stock,wait_in_stock,b.good_name")->find();
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");