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

app/admin/model/GoodStockInfo.php

@@ -82,7 +82,7 @@ class GoodStockInfo extends Model
 				$num=0;
 		    }
 			self::update($update,$item);
-		    $isstock==0 ?? self::name("good_stock")->where($stock[$item['stockid']])->update($stockup);
+		    if($isstock==1) self::name("good_stock")->where($stock[$item['stockid']])->update($stockup);
 		    $list[]=$temp;
 		}
 		return $list;

app/command/ImportOrderFromCHandleData.php

@@ -317,7 +317,7 @@ class ImportOrderFromCHandleData extends Command
 			            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
 			            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5, "b.companyNo" =>$supplierNo])
 			            ->column('a.id');
-	                        $stockinfo =GoodStockInfo::OrderBn($orderCode,$stockid,$good_num);
+	                        $stockinfo =GoodStockInfo::OrderBn($orderCode,$stockid,intval($good_num));
 	                        if($stockinfo==false){
 	                             throw new Exception('库存商品更新库存失败');
 	                        }

app/command/handleYzOrderData.php

@@ -397,7 +397,7 @@ class handleYzOrderData extends Command
 			            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
 			            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5, "b.companyNo" =>$supplierNo])
 			            ->column('a.id');
-	                        $stockinfo =GoodStockInfo::OrderBn($orderCode,$stockid,$good_num);
+	                        $stockinfo =GoodStockInfo::OrderBn($orderCode,$stockid,intval($good_num));
 	                        if($stockinfo==false){
 	                            throw new Exception('库存商品更新库存失败');
 	                        }