JC34WMS.git - Gitblit

			@@ -126,11 +126,11 @@
			throw new Exception("当前物料及批次与单据无关联，请核实!");
			}
			//判断托盘是否在库外
			var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
			if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
			{
			throw new Exception("该托盘已有储位信息，不可组托，请核实！");
			}
			//var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
			//if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
			//{
			// throw new Exception("该托盘已有储位信息，不可组托，请核实！");
			//}

			#endregion

			@@ -272,13 +272,13 @@
			}

			// 判断库存明细是否已有此托盘信息
			var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
			var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.LotNo == detail.LotNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
			var sdId1 = 0;
			if (sd1 != null)
			{
			sdId1 = sd1.Id;
			// 库存已存在更新数据
			sd1.Qty = bind.Qty;
			sd1.Qty += bind.Qty;
			sd1.CompleteTime = comTime;
			sd1.UpdateUser = userId;
			sd1.UpdateTime = comTime;
			@@ -286,7 +286,7 @@
			Db.Updateable(sd1).ExecuteCommand();
			}
			else
			{
			{
			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			@@ -325,6 +325,14 @@
			CreateUser = 0,
			CreateTime = comTime
			};
			var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
			if (palletData != null)
			{
			sd1.WareHouseNo = palletData.WareHouseNo;
			sd1.RoadwayNo = palletData.RoadwayNo;
			sd1.AreaNo = palletData.AreaNo;
			sd1.LocatNo = palletData.LocatNo;
			}

			//维护库存明细货主/供应商信息 //0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
			if (notice.Type == "0" \|\| notice.Type == "2" \|\| notice.Type == "4" \|\| notice.Type == "6" \|\| notice.Type == "7")
			@@ -484,6 +492,10 @@
			}
			detail.UpdateUser = userId;
			detail.UpdateTime = comTime;
			if (notice.Type == "4" \|\| notice.Type == "8")
			{
			detail.InspectStatus = "1";//车间退料默认检验合格
			}
			//更新入库单明细
			Db.Updateable(detail).ExecuteCommand();

			@@ -504,7 +516,10 @@
			#endregion

			#region 库存明细
			sd1.Qty = bind.Qty;
			if (sd1.Qty <= 0)
			{
			sd1.Qty = bind.Qty;
			}
			//更改库存明细数量
			Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
			#endregion
			@@ -1822,7 +1837,7 @@

			}
			}
			else if (notice.Type == "1" \|\| notice.Type == "4") //采购入库
			else if (notice.Type == "1" \|\| notice.Type == "4" \|\| notice.Type == "8") //采购入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			@@ -2726,7 +2741,7 @@
			ExpirationTime = boxInfoOne.ExpirationTime,
			Status = "0",
			InspectMark = boxInfoOne.InspectMark,
			InspectStatus = sku.IsInspect,
			InspectStatus = "1",//sku.IsInspect,//从车间入库的质检状态默认合格
			BitPalletMark = "1",
			PackagNo = sku.PackagNo,