JC34WMS.git - Gitblit

			@@ -280,7 +280,7 @@
			sd1 = new DataStockDetail()
			{
			LotNo = bind.LotNo,
			LotText = bind.LotText,
			//LotText = bind.LotText,
			SupplierLot = bind.SupplierLot,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			@@ -304,7 +304,7 @@
			ExpirationTime = bind.ExpirationTime,
			Status = "0",
			InspectMark = bind.InspectMark,
			InspectStatus = sku.IsInspect,
			//InspectStatus = sku.IsInspect,
			BitPalletMark = bind.BitPalletMark,
			PackagNo = sku.PackagNo,
			IsBale = bind.IsBale,
			@@ -314,13 +314,28 @@
			CreateUser = 0,
			CreateTime = comTime
			};

			//2025年12月04日甲方要求“生产退料入库”默认质检合格
			if (notice.Type == "8")
			{
			sd1.InspectStatus = "1";
			sd1.LotText = "";
			}
			else
			{
			sd1.InspectStatus = sku.IsInspect;
			sd1.LotText = bind.LotText;
			}

			//生产日期
			if (!string.IsNullOrEmpty(detail.Lot1))
			{
			sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//生产日期
			sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);
			}
			//到期日期
			if (!string.IsNullOrEmpty(detail.Lot2))
			{
			sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//到期日期
			sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);
			}
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
			if (palletData != null)
			@@ -428,7 +443,7 @@
			Standard = sku.Standard,
			ProductionTime = box.ProductionTime,
			SupplierLot = box.SupplierLot,
			InspectStatus = sku.IsInspect,
			//InspectStatus = sku.IsInspect,
			InspectMark = box.InspectMark,
			BitBoxMark = box.BitBoxMark,
			ExpirationTime = box.ExpirationTime,
			@@ -436,6 +451,9 @@
			CreateUser = 0,
			CreateTime = comTime
			};
			//2025年12月04日甲方要求“生产退料入库”默认质检合格
			box2.InspectStatus = (notice.Type == "8") ? "1" : sku.IsInspect;

			//添加库存箱码明细
			Db.Insertable(box2).ExecuteCommand();
			#endregion
			@@ -1350,7 +1368,8 @@
			{
			sdId1 = sd1.Id;
			// 库存已存在更新数据
			sd1.Qty += bind.Qty;
			//sd1.Qty += bind.Qty;
			sd1.Qty += model.SkuQty;
			sd1.CompleteTime = comTime;
			sd1.UpdateUser = userId;
			sd1.UpdateTime = comTime;
			@@ -1461,6 +1480,8 @@
			bind.BitPalletMark = "0";
			sd1.BitPalletMark = "0";
			}
			Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();

			//if (bind.Qty > pNum && isTextTable == 0)
			if (bind.Qty > pNum)
			{
			@@ -1515,9 +1536,9 @@

			#region 更改库存明细数量

			sd1.Qty = bind.Qty;
			//更改库存明细数量
			Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
			//sd1.Qty = bind.Qty;
			////更改库存明细数量
			//Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();

			#endregion

			@@ -2273,7 +2294,7 @@
			BoxNo = obj.Data.BoxNo,
			BoxNo2 = box.BoxNo2,
			BoxNo3 = box2.BoxNo3,
			Qty = obj.Data.Qty,
			Qty = 1,//obj.Data.Qty,
			BitBoxMark = obj.Data.BitBoxMark,

			ASNNo = "",
			@@ -2286,7 +2307,7 @@
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			LotNo = box2.LotNo,
			LotText = obj.Data.LotNoBoxNum,
			LotText = "",
			ProductionTime = DateTime.Parse(box2.ProductionTime),
			ExpirationTime = DateTime.Parse(box2.ExpirationTime),
			//CompleteTime = "",
			@@ -3023,6 +3044,11 @@
			CreateTime = comTime
			};

			//看要绑定的托盘在库存明细是否有储位信息
			string locatNoSql = $@"select LocatNo from DataStockDetail where PalletNo='{palletNo}' and isnull(LocatNo,'')!='' group by LocatNo";
			string locatNoStr = Db.Ado.GetString(locatNoSql);
			sd1.LocatNo = string.IsNullOrWhiteSpace(locatNoStr) ? "" : locatNoStr;

			//添加库存明细
			sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
			}