Browse Source

Merge branch 'version1.5' of wugg/phpstock into master-online

wugg 3 years ago
parent
commit
78ca8007cd
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/admin/controller/Purchin.php

+ 2 - 2
app/admin/controller/Purchin.php

@@ -475,11 +475,11 @@ class Purchin extends BaseController
                         Db::rollback();
                         return error_show(1002,"未找到采购单数据");
                     }
-                    $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'],"good_type_code"=>$cgdinfo['skuCode'],"is_del"=>0])->find();
+                    $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
 
                     if(empty($good)) {
                       $good=[
-                          "good_type_code"=>$cgdinfo['skuCode'],
+                          "spuCode"=>$cgdinfo['spuCode'],
                           "wsm_code"=>$info['wsm_code'],
                           "usable_stock"=>0,
                           "wait_out_stock"=>0,