ad

app/admin/controller/Resign.php

@@ -731,9 +731,11 @@ class Resign extends BaseController
         if($supplier==false){
             return error_show(1004,"未找到供应商数据");
         }
-        $goodnake =Db::name("good_nake")->where([["spuCode","=",$info['spuCode']],["is_del","=",0],"min_num","<=",
-            $info['good_num']])->order("min_num desc")->find();
-
+        $goodnake =Db::name("good_nake")->where([["spuCode","=",$info['spuCode']],["is_del","=",0],["min_num","<=",
+            $info['good_num']]])->order("min_num desc")->find();
+        if($goodnake==false){
+            return error_show(1004,"未找到成本数据");
+        }
         $cgdCode = makeNo("CG");
 
         $cg =["cgdNo"=>$cgdCode,

app/admin/controller/WareHouse.php

@@ -164,6 +164,10 @@ class WareHouse extends BaseController
         if($contactor!=""){
             $condition[]=["a.contactor","=",$contactor];
         }
+        $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? intval($post['wsm_type']) :"";
+        if($wsm_type!=""){
+            $condition[]=["a.wsm_type","=",$wsm_type];
+        }
         $contactor_name = isset($post['contactor_name'])&&$post['contactor_name']!="" ? trim($post['contactor_name']) :"";
         if($contactor_name!=""){
             $condition[]=["a.contactor_name","like","%{$contactor_name}%"];