Browse Source

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

wugg 2 years ago
parent
commit
b4943ea11f
1 changed files with 7 additions and 6 deletions
  1. 7 6
      app/admin/controller/Check.php

+ 7 - 6
app/admin/controller/Check.php

@@ -594,7 +594,7 @@ public function edit()
         $insert=[];
         foreach ($data as $value){
             if($value["value1"]==""){
-                return error_show(1003,"商品属性code 不能为空");
+                return error_show(1003,"商品编号不能为空");
             }
             if($value["value15"]===""){
                 continue;
@@ -603,13 +603,14 @@ public function edit()
                 "is_del"=>0])->find();
             $stock_num = isset($stock) ? $stock['usable_stock']:0;
             $insert[]=[
-                "spuCode"=>$value["value1"],
-                "good_name"=>$value["value2"],
+                "spuCode"=>$value["value0"],
+                "good_name"=>$value["value1"],
                 "origin_price"=>0,
                 "origin_num"=>isset($stock) ? $stock['usable_stock']:0,
-                "check_num"=>$value["value15"],
-                "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"]),
+                "check_num"=>$value["value14"],
+                "is_profit"=>intval($value["value14"])>=$stock_num ?0:1,
+                "diff_num"=>intval($value["value14"])>=$stock_num ?intval($value["value14"])
+                    -$stock_num:$stock_num-intval($value["value14"]),
                 'addtime'=>date("Y-m-d H:i:s"),
                 'updatetime'=>date("Y-m-d H:i:s"),
                 "check_code"=>$fo['check_code']