ad

app/abutment/controller/Order.php

@@ -435,7 +435,7 @@ class Order extends HomeBaseController
             ->whereIn('cgdNo', $param['cgdNo'])
             ->where(['is_del' => 0, 'supplierNo' => $this->request->user['supplierNo']])
             ->where('status', '=', 1)
-            ->column('id,wsm_code,good_num,good_price,spuCode,order_type,send_status,status', 'cgdNo');
+            ->column('id,wsm_code,good_num,good_price,spuCode,order_type,send_status,status,supplierNo', 'cgdNo');
 
         if (empty($cgdinfo)) return json_show(1005, "未找到采购单数据或采购单未发货");
 
@@ -544,8 +544,8 @@ class Order extends HomeBaseController
                     $upd = Db::name("good_stock")->save($good);
                     $stockid=$good['id']?? Db::name("good_stock")->getLastInsID();
                     //商品变动日志表，good_log_code字段存储采购单单号
-                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
-                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 2, 'stock' => $send_num, "stock_name" => "wait_in_stock"];
+                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" =>$stockid, "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
+                    $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" =>$stockid, "type" => 2, 'stock' => $send_num, "stock_name" => "wait_in_stock"];
                     if ($upd) {
                         GoodLog::LogAdd(['id' => $uid, 'nickname' => $nickname], $good_data, 'RKD');
                         if ($cgdinfo[$cgdNo]['order_type'] == 1) {

app/admin/controller/Orderback.php

@@ -462,8 +462,8 @@ class Orderback extends Base
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
-                        			$total_num=0;
                         			$ve['num']-=$total_num;
+                        			$total_num=0;
                         		}
                         		$bnin=GoodStockInfo::ReturnAdd($stockid,$ve['bnCode'],$tempnum,$ve['stockid']);
                         		if($bnin==false){
@@ -523,8 +523,8 @@ class Orderback extends Base
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
-                        			$total_num=0;
                         			$ve['num']-=$total_num;
+                        			$total_num=0;
                         		}
                         	    $bnin=GoodStockInfo::ReturnAdd($stockid,$ve['bnCode'],$tempnum,$ve['stockid']);
                         		if($bnin==false){

app/admin/model/GoodStockInfo.php

@@ -40,7 +40,7 @@ class GoodStockInfo extends Model
 			$temp["balance_num"]=$total_num;
 			$temp["used_num"]=$data["used_num"]-$num;
 			$temp["updatetime"]=date("Y-m-d H:i:s");
-			$result=self::update($temp,$data);
+			$result=self::update($temp,$data)->getNumRows();
 		}
 
 		return $result;
@@ -95,7 +95,7 @@ class GoodStockInfo extends Model
 			$update["balance_num"]=$num;
 			$update["total_num"]=$data["used_num"]+$num;
 			$update["updatetime"]=date("Y-m-d H:i:s");
-		return self::update($update,$data);
+		return self::update($update,$data)->getNumRows();
     }
 	/**
 	* @param string $orderCode
@@ -187,17 +187,18 @@ class GoodStockInfo extends Model
 				}
 			}
 
-			return	empty($stock)? self::insert($update): self::update($update,$stock);
+			return	empty($stock)? self::insert($update): self::update($update,$stock)->getNumRows();
 	}
-	/** 退货退到其他仓库的话 原仓库批次总数 - 退货数量
+	/**
+    退货退到其他仓库的话 原仓库批次总数 - 退货数量
 	* @param $stockid 退货仓库
 	* @param $bnCode bn批次编号
 	* @param $num 退货数量
 	* @param $origin_stockid 原仓库
-	 * @return \app\admin\model\GoodStockInfo|int|string
+	 * @return int
 	* @throws \think\Exception
 	 */
-	static function ReturnAdd($stockid,$bnCode,$num,$origin_stockid){
+	static function ReturnAdd(int $stockid,string $bnCode,int $num,int $origin_stockid){
 		$origin = self::where(["stockid"=>$origin_stockid,"bnCode"=>$bnCode])->findOrEmpty()->toArray();
 		if($stockid!=$origin_stockid){
 			if(empty($origin))throw new Exception("未找到Bn订单数据",1006);
@@ -218,13 +219,13 @@ class GoodStockInfo extends Model
 						"addtime"=>date("Y-m-d H:i:s"),
 						"updatetime"=>date("Y-m-d H:i:s")
 						];
-			return self::insert($update);
+			$result= self::insert($update);
 		}else{
 						$update['balance_num']=$stock['balance_num']+$num;
 						$stockid!=$origin_stockid ? $update['total_num']=$stock['total_num']+$num:$update['used_num']=$stock['used_num']-$num;
 						$update['updatetime']=date("Y-m-d H:i:s");
-					return 	self::update($update,$stock);
+					$result=self::update($update,$stock)->getNumRows();
 		}
-
+		return $result;
 	}
 }