ad

app/admin/controller/Check.php

@@ -526,7 +526,7 @@ public function dell(){
                 "origin_price"=>0,
                 "origin_num"=>isset($stock) ? $stock['usable_stock']:0,
                 "check_num"=>$value["value15"],
-                "is_profit"=>intval($value["value15"])>=$stock_num ?1:0,
+                "is_profit"=>intval($value["value15"])>=$stock_num ?0:1,
                 "diff_num"=>intval($value["value15"])>=$stock_num ?intval($value["value15"])-$stock_num:$stock_num-intval($value["value15"]),
                 'addtime'=>date("Y-m-d H:i:s"),
                 'updatetime'=>date("Y-m-d H:i:s"),
@@ -536,11 +536,22 @@ public function dell(){
         if(empty($insert)){
             return error_show(1003,"盘点数据不可用");
         }
-        $inst = Db::name("check_item")->insertAll($insert);
-        if($inst){
-            return app_show(0,"盘点数据导入成功");
-        }else{
-            return app_show(0,"盘点数据导入失败");
+        Db::startTrans();
+        try{
+            $inst = Db::name("check_item")->insertAll($insert);
+            if($inst){
+                $check_up = Db::name("good_check")->where(["check_code"=>$fo['check_code'],"is_del"=>0])->save(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+                if($check_up){
+                    Db::commit();
+                    return app_show(0,"盘点数据导入成功");
+                }
+            }
+            Db::rollback();
+           return error_show(1002,"盘点数据导入失败");
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1002,"盘点数据导入失败");
         }
+
     }
 }

app/admin/controller/Good.php

@@ -225,6 +225,12 @@ class Good extends \app\BaseController
       if($wsm_code!==""){
           $condition[]=["wsm_code","=",$wsm_code];
       }
+      $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
+          :"";
+      if($suplierNo!==""){
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+          $condition[]=["wsm_code","in",$wsmcode];
+      }
       $build= Db::name("good_stock")->where($condition)->group("wsm_code")->field("wsm_code")->buildSql();
       $count = Db::table($build." a")->count();
       $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";