JC26WMS.git - Gitblit

			@@ -3375,7 +3375,7 @@
			{
			throw new Exception("托盘号不可为空!");
			}


			//根据单据号获取入库单总单
			var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
			if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
			@@ -3418,8 +3418,6 @@
			throw new Exception("开启连续组托时，尾箱码信息不可为空!");
			}
			}

			#endregion

			var comTime = DateTime.Now;

			@@ -3445,6 +3443,8 @@
			{
			throw new Exception("该托盘在库存已有其它物料批次信息，请核实！");
			}

			#endregion

			#region 包装

			@@ -3487,10 +3487,11 @@
			{
			throw new Exception($"绑定失败，{detail.SkuNo}物品包装未找到！");
			}


			#endregion

			#region 验证是否允许立库同托盘不同物料入库或同托盘同物料不同批次入库

			var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
			if (palletBind != null)
			{
			@@ -3504,416 +3505,564 @@
			}
			}
			}
			#endregion
			//liudl && m.Status != "2" 组盘既入库完成无需根据托盘状态判断
			var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
			var bindId = 0;
			if (bind == null)
			{
			bind = new BllPalletBind
			{
			ASNNo = model.AsnNo,
			ASNDetailNo = (int)model.AsnDetailId,
			PalletNo = model.PalletNo,

			Qty = model.SkuQty,
			FullQty = pNum,
			Status = "2",//入库完成
			Type = "0",
			LotNo = model.LotNo,
			LotText = detail.LotText,
			SupplierLot = detail.SupplierLot,
			//InspectMark = model.IsSample, //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			//SamplingQty = 0, //取样数量后期业务开发时接口传值需添加对应字段判断
			BitPalletMark = "1",
			IsBale = "0",
			IsBelt = "0",
			CreateUser = userId,
			Demo = model.Demo,

			};
			// 插入托盘绑定表
			bindId = Db.Insertable(bind).ExecuteReturnIdentity();
			}
			else
			{
			bindId = bind.Id;
			bind.Qty += model.SkuQty;
			}
			if (bind.Qty < 0)
			{
			throw new Exception("组盘数量不能小于0");
			}
			#region 库存明细
			//获取该批次最终质检结果
			BllQualityInspect quality = new BllQualityInspect();
			//判断是否为退货入库单
			if (notice.Type == "3")
			{
			quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
			}
			else
			{
			quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
			}
			var tags = "0";
			if (notice.Type == "3" \|\| notice.Type == "4")
			{
			tags = "1";
			}

			// 判断库存明细是否已有此托盘信息
			var sd1 = Db.Queryable<DataStockDetail>()
			.First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
			var sdId1 = 0;
			if (sd1 != null)
			{
			sdId1 = sd1.Id;
			// 库存已存在更新数据
			sd1.Qty = bind.Qty;
			sd1.CompleteTime = comTime;
			sd1.UpdateUser = userId;
			sd1.UpdateTime = comTime;

			Db.Updateable(sd1).ExecuteCommand(); //修改质检信息
			}
			else
			{
			// 库存不存在插入数据
			sd1 = new DataStockDetail()
			{
			LotNo = bind.LotNo,
			LotText = bind.LotText,
			SupplierLot = bind.SupplierLot,
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			Qty = bind.Qty,
			LockQty = 0,
			FrozenQty = 0,
			InspectQty = 0,
			ASNNo = bind.ASNNo,
			ASNDetailNo = bind.ASNDetailNo,
			WareHouseNo = "",//所属仓库
			RoadwayNo = "",//所属巷道
			AreaNo = "",//所属区域
			LocatNo = "",//储位地址
			PalletNo = bind.PalletNo,
			PalletNo2 = bind.PalletNo2,
			PalletNo3 = bind.PalletNo3,
			PalletTags = tags,
			CompleteTime = comTime,
			ProductionTime = bind.ProductionTime,
			ExpirationTime = bind.ExpirationTime,
			Status = "0",
			InspectMark = bind.InspectMark,
			InspectStatus = sku.IsInspect,
			BitPalletMark = bind.BitPalletMark,
			PackagNo = detail.PackagNo, //liudl 由sku的包装编号变为入库单明细的包装编码
			IsBale = bind.IsBale,
			IsBelt = bind.IsBelt,

			IsDel = "0",
			CreateUser = 0,
			CreateTime = comTime
			};

			//维护库存明细货主/供应商信息
			if (notice.Type == "0" \|\| notice.Type == "2" \|\| notice.Type == "4" \|\| notice.Type == "6" \|\| notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
			{
			sd1.OwnerNo = notice.CustomerNo;//货主编码
			sd1.OwnerName = notice.CustomerName;//货主名称
			}
			else if (notice.Type == "1" \|\| notice.Type == "5")//1:采购入库,2:其它入库
			{
			sd1.SupplierNo = notice.CustomerNo;//供应商编码
			sd1.SupplierName = notice.CustomerName;//供应商名称
			}
			if (quality != null)
			{
			//修改合格不合格数量
			if (quality.IsQualified == "1") //合格
			{
			//增加合格数量
			quality.PassQty += bind.Qty;
			sd1.InspectStatus = "1";
			}
			else if (quality.IsQualified == "0") //不合格
			{
			//增加不合格数量
			quality.FailQty += bind.Qty;
			sd1.InspectStatus = "2";
			}
			Db.Updateable(quality).ExecuteCommand(); //修改质检信息
			}
			//添加库存明细
			sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
			}
			#endregion

			#region 箱码信息
			var msgStr = $"箱号为{model.BoxNo}";
			var boxInfoList = new List<BllBoxInfo>();

			//首箱
			var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();
			if (boxInfo.Count == 0)
			{
			throw new Exception("箱码信息不存在!");
			}
			boxInfo = boxInfo.Where(m => m.Status == "0").ToList();
			if (boxInfo.Count == 0)
			{
			throw new Exception("箱码已被使用!");
			}
			boxInfoList.AddRange(boxInfo);
			//是否连续组托
			if (model.IsContinue == "1")
			{
			//尾箱
			var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo).ToList();
			if (boxInfo2.Count == 0)
			{
			throw new Exception("尾箱码信息不存在!");
			}
			boxInfo2 = boxInfo2.Where(m => m.Status == "0").ToList();
			if (boxInfo2.Count == 0)
			{
			throw new Exception("尾箱箱码已被使用!");
			}
			boxInfoList.AddRange(boxInfo2);
			var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
			var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
			boxInfoList.AddRange(list);
			msgStr += $"尾箱号为{model.TailBoxNo}";
			}

			#endregion
			/* 因考虑可能会有拼箱(同物料不同批次)，逻辑如下
			* 查询出要绑定托盘的箱码信息、分组整理、判断是否有拼箱(允许有多个)，循环添加箱码<->库存箱码和对应的托盘绑定<->库存托盘明细信息
			* 循环箱码需要判断是否是当前单据，如不是：更新对应单据
			*
			*
			*/

			// 更改箱支关系表
			decimal factQty = 0.00m;//托盘总数量
			var isSample = "0";//是否取样
			var sampleQty = 0m;//取样数量
			//#region 箱码信息
			//var msgStr = $"箱号为{model.BoxNo}";
			//var boxInfoList = new List<BllBoxInfo>();


			var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
			foreach (var g in boxGroup)
			{
			decimal boxFullQty = 0;//箱内总数量
			foreach (var box in g)
			{
			if (box.BindNo != null && box.BindNo != 0)
			{
			continue;
			}
			//箱内物料批次与单据明细不符合
			if (box.SkuNo != detail.SkuNo \|\| box.LotNo != model.LotNo)
			{
			throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致，请核实!");
			}
			////首箱
			//var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();
			//if (boxInfo.Count == 0)
			//{
			// throw new Exception("箱码信息不存在!");
			//}
			//boxInfo = boxInfo.Where(m => m.Status == "0").ToList();
			//if (boxInfo.Count == 0)
			//{
			// throw new Exception("箱码已被使用!");
			//}
			//boxInfoList.AddRange(boxInfo);
			////是否连续组托
			//if (model.IsContinue == "1")
			//{
			// //尾箱
			// var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo).ToList();
			// if (boxInfo2.Count == 0)
			// {
			// throw new Exception("尾箱码信息不存在!");
			// }
			// boxInfo2 = boxInfo2.Where(m => m.Status == "0").ToList();
			// if (boxInfo2.Count == 0)
			// {
			// throw new Exception("尾箱箱码已被使用!");
			// }
			// boxInfoList.AddRange(boxInfo2);
			// var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
			// var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
			// boxInfoList.AddRange(list);
			// msgStr += $"尾箱号为{model.TailBoxNo}";
			//}

			box.ASNNo = model.AsnNo;
			box.ASNDetailNo = model.AsnDetailId;
			box.BindNo = bindId;
			box.PalletNo = model.PalletNo;
			box.Status = "2";
			//box.InspectMark = model.IsSample; //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			//box.SamplingQty = 0; //取样数量后期业务开发时接口传值需添加对应字段判断
			box.CompleteTime = comTime;
			box.UpdateTime = comTime;
			box.UpdateUser = userId;
			//#endregion

			//box.Qty = box.Qty;
			//box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";
			//// 更改箱支关系表
			//decimal factQty = 0.00m;//托盘总数量
			//var isSample = "0";//是否取样
			//var sampleQty = 0m;//取样数量

			factQty += box.Qty;
			boxFullQty += box.Qty;
			if (box.InspectMark == "1") //判断是否取样
			{
			isSample = "1";
			sampleQty += (decimal)box.SamplingQty;
			}
			//var boxInfoStr = boxInfoList.Select(m => m.BoxNo3).ToList();//支码集合
			//var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && boxInfoStr.Contains(m.BoxNo3));//从库存中获取对应的箱码信息集合

			#region 库存箱码明细
			var box2 = new DataBoxInfo()
			{
			StockDetailId = sdId1,
			BindNo = bind.Id,
			BoxNo = box.BoxNo,
			BoxNo2 = box.BoxNo2,
			BoxNo3 = box.BoxNo3,
			PalletNo = box.PalletNo,
			PalletNo2 = box.PalletNo2,
			PalletNo3 = box.PalletNo3,
			Qty = box.Qty,
			FullQty = box.FullQty,
			Status = "2",//0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			LotNo = box.LotNo,
			LotText = box.LotText,
			SkuNo = box.SkuNo,
			SkuName = box.SkuName,
			Standard = sku.Standard,
			ProductionTime = box.ProductionTime,
			SupplierLot = box.SupplierLot,
			InspectStatus = sku.IsInspect,
			InspectMark = box.InspectMark,
			BitBoxMark = box.BitBoxMark,
			ExpirationTime = box.ExpirationTime,

			CreateUser = 0,
			CreateTime = comTime
			};
			//添加库存箱码明细
			Db.Insertable(box2).ExecuteCommand();
			#endregion
			}
			if (boxFullQty > bNum)
			{
			throw new Exception($"绑定失败，{g.Key}箱码绑定数量大于该物品包装数量！");
			}
			}
			Db.Updateable(boxInfoList).ExecuteCommand();

			// 更新托盘绑定表
			bind.Qty += factQty;

			//if (bind.FullQty < bind.Qty && isTextTable == 0)
			if (bind.FullQty < bind.Qty)
			{
			throw new Exception("托盘绑定数量已超出该物料包装数量");
			}

			if (bind.FullQty == bind.Qty)
			{
			bind.BitPalletMark = "0";
			sd1.BitPalletMark = "0";
			}
			//if (bind.Qty > pNum && isTextTable == 0)
			if (bind.Qty > pNum)
			{
			throw new Exception($"绑定失败，{bind.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
			}

			if (isSample == "1")
			{
			bind.InspectMark = "1";
			bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
			}
			Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();

			#region 入库单及明细
			decimal addQty = factQty;

			detail.FactQty += addQty;//已组数量
			detail.CompleteQty += addQty;//完成数量
			if (isSample == "1") //后期业务开发时接口传值改为判断是否取样
			{
			detail.IsSampling = "1";
			}
			detail.Status = "1";//0：等待执行 1：正在执行 2：执行完成
			if (detail.CompleteQty >= detail.Qty)
			{
			detail.Status = "2";
			detail.CompleteTime = comTime;
			}
			detail.UpdateUser = userId;
			detail.UpdateTime = comTime;
			//更新入库单明细
			Db.Updateable(detail).ExecuteCommand();

			notice.UpdateUser = userId;
			notice.UpdateTime = comTime;
			if (notice.Status == "0")
			{
			notice.Status = "1";
			}
			var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
			.Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
			if (asnDetailNum == 0)
			{
			notice.Status = "2";
			notice.CompleteTime = comTime;//完成时间
			}
			//更新入库单
			Db.Updateable(notice).ExecuteCommand();
			#endregion

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

			#region 库存
			var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
			if (dataStock != null)
			{
			dataStock.Qty += factQty;
			//var boxGroup = boxInfoList.GroupBy(m => new { m.BoxNo ,m.LotNo}).ToList(); //根据箱码、批此分组
			//foreach (var g in boxGroup)//21
			//{

			if (bind.InspectMark == "1")
			{
			dataStock.IsSampling = bind.InspectMark;
			}
			Db.Updateable(dataStock).ExecuteCommand();
			}
			else
			{
			var stock = new DataStock()
			{
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			LotNo = bind.LotNo,
			LotText = bind.LotText,
			Qty = bind.Qty,
			LockQty = 0,
			FrozenQty = 0,
			IsSampling = bind.InspectMark,
			IsDel = "0",
			CreateUser = userId,
			CreateTime = comTime
			};
			//维护库存货主信息
			if (notice.Type == "0" \|\| notice.Type == "2" \|\| notice.Type == "4" \|\| notice.Type == "6" \|\| notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
			{
			stock.OwnerNo = notice.CustomerNo;//货主编码
			stock.OwnerName = notice.CustomerName;//货主名称
			}
			Db.Insertable(stock).ExecuteCommand();
			}
			#endregion
			// var isYou = false;//需判断是否是存在库存
			// var count = dataBoxInfo.Count(m => m.BoxNo == g.Key.BoxNo);
			// if (count >0)
			// {
			// isYou = true;
			// }

			#region 质检请验
			if ((notice.Type == "1" \|\| notice.Type == "4" \|\| notice.Type == "5") && sku.IsInspect != "1")
			{
			var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
			if (qualityRequest == null)
			{
			string qcNo = new Common().GetMaxNo("QC");
			qualityRequest = new BllQualityInspectionRequest();
			qualityRequest.QcNo = qcNo;
			qualityRequest.Status = "0";
			qualityRequest.SkuNo = sku.SkuNo;
			qualityRequest.SkuName = sku.SkuName;
			qualityRequest.LotNo = bind.LotNo;
			qualityRequest.SupplierLot = bind.SupplierLot;
			qualityRequest.Qty = detail.Qty;
			qualityRequest.SamplingQty = 0;
			qualityRequest.ASNNo = detail.ASNNo;
			qualityRequest.CreateUser = userId;
			qualityRequest.CreateTime = comTime;
			//添加质检请验单
			Db.Insertable(qualityRequest).ExecuteCommand();
			}
			}
			#endregion
			// var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo && m.LotNo == g.Key.LotNo);

			// var bindId = 0;
			// if (bind == null && !isYou)
			// {
			// bind = new BllPalletBind
			// {
			// ASNNo = model.AsnNo,
			// ASNDetailNo = (int)model.AsnDetailId,
			// PalletNo = model.PalletNo,

			// Qty = model.SkuQty,
			// FullQty = pNum,
			// Status = "2",//入库完成
			// Type = "0",
			// LotNo = model.LotNo,
			// LotText = detail.LotText,
			// SupplierLot = detail.SupplierLot,
			// //InspectMark = model.IsSample, //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			// //SamplingQty = 0, //取样数量后期业务开发时接口传值需添加对应字段判断
			// BitPalletMark = "1",
			// IsBale = "0",
			// IsBelt = "0",
			// CreateUser = userId,
			// Demo = model.Demo,

			// };
			// // 插入托盘绑定表
			// bindId = Db.Insertable(bind).ExecuteReturnIdentity();
			// }
			// else
			// {
			// bindId = bind.Id;
			// bind.Qty += model.SkuQty;
			// }
			// if (bind.Qty < 0)
			// {
			// throw new Exception("组盘数量不能小于0");
			// }


			// decimal boxFullQty = 0;//箱内总数量
			// foreach (var box in g)//支码 2
			// {
			// if (box.BindNo != null && box.BindNo != 0)
			// {
			// continue;
			// }
			// //箱内物料与单据明细不符合同托盘可同物料不同批次
			// if (box.SkuNo != detail.SkuNo)
			// {
			// throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致，请核实!");
			// }




			// box.ASNNo = model.AsnNo;
			// box.ASNDetailNo = model.AsnDetailId;
			// box.BindNo = bindId;
			// box.PalletNo = model.PalletNo;
			// box.Status = "2";
			// //box.InspectMark = model.IsSample; //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			// //box.SamplingQty = 0; //取样数量后期业务开发时接口传值需添加对应字段判断
			// box.CompleteTime = comTime;
			// box.UpdateTime = comTime;
			// box.UpdateUser = userId;

			// //box.Qty = box.Qty;
			// //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";

			// factQty += box.Qty;
			// boxFullQty += box.Qty;
			// if (box.InspectMark == "1") //判断是否取样
			// {
			// isSample = "1";
			// sampleQty += (decimal)box.SamplingQty;
			// }

			// #region 库存箱码明细
			// var box2 = new DataBoxInfo()
			// {
			// StockDetailId = sdId1,
			// BindNo = bind.Id,
			// BoxNo = box.BoxNo,
			// BoxNo2 = box.BoxNo2,
			// BoxNo3 = box.BoxNo3,
			// PalletNo = box.PalletNo,
			// PalletNo2 = box.PalletNo2,
			// PalletNo3 = box.PalletNo3,
			// Qty = box.Qty,
			// FullQty = box.FullQty,
			// Status = "2",//0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			// LotNo = box.LotNo,
			// LotText = box.LotText,
			// SkuNo = box.SkuNo,
			// SkuName = box.SkuName,
			// Standard = sku.Standard,
			// ProductionTime = box.ProductionTime,
			// SupplierLot = box.SupplierLot,
			// InspectStatus = sku.IsInspect,
			// InspectMark = box.InspectMark,
			// BitBoxMark = box.BitBoxMark,
			// ExpirationTime = box.ExpirationTime,

			// CreateUser = 0,
			// CreateTime = comTime
			// };
			// //添加库存箱码明细
			// Db.Insertable(box2).ExecuteCommand();
			// #endregion
			// }
			// if (boxFullQty > bNum)
			// {
			// throw new Exception($"绑定失败，{g.Key}箱码绑定数量大于该物品包装数量！");
			// }
			//}
			//Db.Updateable(boxInfoList).ExecuteCommand();


			//#region 库存明细
			////获取该批次最终质检结果
			//BllQualityInspect quality = new BllQualityInspect();
			////判断是否为退货入库单
			//if (notice.Type == "3")
			//{
			// quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
			//}
			//else
			//{
			// quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
			//}
			//var tags = "0";
			//if (notice.Type == "3" \|\| notice.Type == "4")
			//{
			// tags = "1";
			//}

			//// 判断库存明细是否已有此托盘信息
			//var sd1 = Db.Queryable<DataStockDetail>()
			// .First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
			//var sdId1 = 0;
			//if (sd1 != null)
			//{
			// sdId1 = sd1.Id;
			// // 库存已存在更新数据
			// sd1.Qty = bind.Qty;
			// sd1.CompleteTime = comTime;
			// sd1.UpdateUser = userId;
			// sd1.UpdateTime = comTime;

			// Db.Updateable(sd1).ExecuteCommand(); //修改质检信息
			//}
			//else
			//{
			// // 库存不存在插入数据
			// sd1 = new DataStockDetail()
			// {
			// LotNo = bind.LotNo,
			// LotText = bind.LotText,
			// SupplierLot = bind.SupplierLot,
			// SkuNo = sku.SkuNo,
			// SkuName = sku.SkuName,
			// Standard = sku.Standard,
			// Qty = bind.Qty,
			// LockQty = 0,
			// FrozenQty = 0,
			// InspectQty = 0,
			// ASNNo = bind.ASNNo,
			// ASNDetailNo = bind.ASNDetailNo,
			// WareHouseNo = "",//所属仓库
			// RoadwayNo = "",//所属巷道
			// AreaNo = "",//所属区域
			// LocatNo = "",//储位地址
			// PalletNo = bind.PalletNo,
			// PalletNo2 = bind.PalletNo2,
			// PalletNo3 = bind.PalletNo3,
			// PalletTags = tags,
			// CompleteTime = comTime,
			// ProductionTime = bind.ProductionTime,
			// ExpirationTime = bind.ExpirationTime,
			// Status = "0",
			// InspectMark = bind.InspectMark,
			// InspectStatus = sku.IsInspect,
			// BitPalletMark = bind.BitPalletMark,
			// PackagNo = detail.PackagNo, //liudl 由sku的包装编号变为入库单明细的包装编码
			// IsBale = bind.IsBale,
			// IsBelt = bind.IsBelt,

			// IsDel = "0",
			// CreateUser = 0,
			// CreateTime = comTime
			// };

			// //维护库存明细货主/供应商信息
			// if (notice.Type == "0" \|\| notice.Type == "2" \|\| notice.Type == "4" \|\| notice.Type == "6" \|\| notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
			// {
			// sd1.OwnerNo = notice.CustomerNo;//货主编码
			// sd1.OwnerName = notice.CustomerName;//货主名称
			// }
			// else if (notice.Type == "1" \|\| notice.Type == "5")//1:采购入库,2:其它入库
			// {
			// sd1.SupplierNo = notice.CustomerNo;//供应商编码
			// sd1.SupplierName = notice.CustomerName;//供应商名称
			// }
			// if (quality != null)
			// {
			// //修改合格不合格数量
			// if (quality.IsQualified == "1") //合格
			// {
			// //增加合格数量
			// quality.PassQty += bind.Qty;
			// sd1.InspectStatus = "1";
			// }
			// else if (quality.IsQualified == "0") //不合格
			// {
			// //增加不合格数量
			// quality.FailQty += bind.Qty;
			// sd1.InspectStatus = "2";
			// }
			// Db.Updateable(quality).ExecuteCommand(); //修改质检信息
			// }
			// //添加库存明细
			// sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
			//}
			//#endregion

			//#region 箱码信息
			//var msgStr = $"箱号为{model.BoxNo}";
			//var boxInfoList = new List<BllBoxInfo>();

			////首箱
			//var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();
			//if (boxInfo.Count == 0)
			//{
			// throw new Exception("箱码信息不存在!");
			//}
			//boxInfo = boxInfo.Where(m => m.Status == "0").ToList();
			//if (boxInfo.Count == 0)
			//{
			// throw new Exception("箱码已被使用!");
			//}
			//boxInfoList.AddRange(boxInfo);
			////是否连续组托
			//if (model.IsContinue == "1")
			//{
			// //尾箱
			// var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo).ToList();
			// if (boxInfo2.Count == 0)
			// {
			// throw new Exception("尾箱码信息不存在!");
			// }
			// boxInfo2 = boxInfo2.Where(m => m.Status == "0").ToList();
			// if (boxInfo2.Count == 0)
			// {
			// throw new Exception("尾箱箱码已被使用!");
			// }
			// boxInfoList.AddRange(boxInfo2);
			// var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
			// var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
			// boxInfoList.AddRange(list);
			// msgStr += $"尾箱号为{model.TailBoxNo}";
			//}

			//#endregion

			//// 更改箱支关系表
			//decimal factQty = 0.00m;//托盘总数量
			//var isSample = "0";//是否取样
			//var sampleQty = 0m;//取样数量


			//var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
			//foreach (var g in boxGroup)
			//{
			// decimal boxFullQty = 0;//箱内总数量
			// foreach (var box in g)
			// {
			// if (box.BindNo != null && box.BindNo != 0)
			// {
			// continue;
			// }
			// //箱内物料批次与单据明细不符合
			// if (box.SkuNo != detail.SkuNo \|\| box.LotNo != model.LotNo)
			// {
			// throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致，请核实!");
			// }

			// box.ASNNo = model.AsnNo;
			// box.ASNDetailNo = model.AsnDetailId;
			// box.BindNo = bindId;
			// box.PalletNo = model.PalletNo;
			// box.Status = "2";
			// //box.InspectMark = model.IsSample; //是否取样托盘后期业务开发时接口传值需添加对应字段判断
			// //box.SamplingQty = 0; //取样数量后期业务开发时接口传值需添加对应字段判断
			// box.CompleteTime = comTime;
			// box.UpdateTime = comTime;
			// box.UpdateUser = userId;

			// //box.Qty = box.Qty;
			// //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";

			// factQty += box.Qty;
			// boxFullQty += box.Qty;
			// if (box.InspectMark == "1") //判断是否取样
			// {
			// isSample = "1";
			// sampleQty += (decimal)box.SamplingQty;
			// }

			// #region 库存箱码明细
			// var box2 = new DataBoxInfo()
			// {
			// StockDetailId = sdId1,
			// BindNo = bind.Id,
			// BoxNo = box.BoxNo,
			// BoxNo2 = box.BoxNo2,
			// BoxNo3 = box.BoxNo3,
			// PalletNo = box.PalletNo,
			// PalletNo2 = box.PalletNo2,
			// PalletNo3 = box.PalletNo3,
			// Qty = box.Qty,
			// FullQty = box.FullQty,
			// Status = "2",//0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			// LotNo = box.LotNo,
			// LotText = box.LotText,
			// SkuNo = box.SkuNo,
			// SkuName = box.SkuName,
			// Standard = sku.Standard,
			// ProductionTime = box.ProductionTime,
			// SupplierLot = box.SupplierLot,
			// InspectStatus = sku.IsInspect,
			// InspectMark = box.InspectMark,
			// BitBoxMark = box.BitBoxMark,
			// ExpirationTime = box.ExpirationTime,

			// CreateUser = 0,
			// CreateTime = comTime
			// };
			// //添加库存箱码明细
			// Db.Insertable(box2).ExecuteCommand();
			// #endregion
			// }
			// if (boxFullQty > bNum)
			// {
			// throw new Exception($"绑定失败，{g.Key}箱码绑定数量大于该物品包装数量！");
			// }
			//}
			//Db.Updateable(boxInfoList).ExecuteCommand();

			//// 更新托盘绑定表
			//bind.Qty += factQty;

			////if (bind.FullQty < bind.Qty && isTextTable == 0)
			//if (bind.FullQty < bind.Qty)
			//{
			// throw new Exception("托盘绑定数量已超出该物料包装数量");
			//}

			//if (bind.FullQty == bind.Qty)
			//{
			// bind.BitPalletMark = "0";
			// sd1.BitPalletMark = "0";
			//}
			////if (bind.Qty > pNum && isTextTable == 0)
			//if (bind.Qty > pNum)
			//{
			// throw new Exception($"绑定失败，{bind.PalletNo}托盘绑定数量大于该物品托盘包装数量！");
			//}

			//if (isSample == "1")
			//{
			// bind.InspectMark = "1";
			// bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
			//}
			//Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();

			//#region 入库单及明细
			//decimal addQty = factQty;

			//detail.FactQty += addQty;//已组数量
			//detail.CompleteQty += addQty;//完成数量
			//if (isSample == "1") //后期业务开发时接口传值改为判断是否取样
			//{
			// detail.IsSampling = "1";
			//}
			//detail.Status = "1";//0：等待执行 1：正在执行 2：执行完成
			//if (detail.CompleteQty >= detail.Qty)
			//{
			// detail.Status = "2";
			// detail.CompleteTime = comTime;
			//}
			//detail.UpdateUser = userId;
			//detail.UpdateTime = comTime;
			////更新入库单明细
			//Db.Updateable(detail).ExecuteCommand();

			//notice.UpdateUser = userId;
			//notice.UpdateTime = comTime;
			//if (notice.Status == "0")
			//{
			// notice.Status = "1";
			//}
			//var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
			// .Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
			//if (asnDetailNum == 0)
			//{
			// notice.Status = "2";
			// notice.CompleteTime = comTime;//完成时间
			//}
			////更新入库单
			//Db.Updateable(notice).ExecuteCommand();
			//#endregion

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

			//#region 库存
			//var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
			//if (dataStock != null)
			//{
			// dataStock.Qty += factQty;

			// if (bind.InspectMark == "1")
			// {
			// dataStock.IsSampling = bind.InspectMark;
			// }
			// Db.Updateable(dataStock).ExecuteCommand();
			//}
			//else
			//{
			// var stock = new DataStock()
			// {
			// SkuNo = sku.SkuNo,
			// SkuName = sku.SkuName,
			// Standard = sku.Standard,
			// LotNo = bind.LotNo,
			// LotText = bind.LotText,
			// Qty = bind.Qty,
			// LockQty = 0,
			// FrozenQty = 0,
			// IsSampling = bind.InspectMark,
			// IsDel = "0",
			// CreateUser = userId,
			// CreateTime = comTime
			// };
			// //维护库存货主信息
			// if (notice.Type == "0" \|\| notice.Type == "2" \|\| notice.Type == "4" \|\| notice.Type == "6" \|\| notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
			// {
			// stock.OwnerNo = notice.CustomerNo;//货主编码
			// stock.OwnerName = notice.CustomerName;//货主名称
			// }
			// Db.Insertable(stock).ExecuteCommand();
			//}
			//#endregion

			//#region 质检请验
			//if ((notice.Type == "1" \|\| notice.Type == "4" \|\| notice.Type == "5") && sku.IsInspect != "1")
			//{
			// var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
			// if (qualityRequest == null)
			// {
			// string qcNo = new Common().GetMaxNo("QC");
			// qualityRequest = new BllQualityInspectionRequest();
			// qualityRequest.QcNo = qcNo;
			// qualityRequest.Status = "0";
			// qualityRequest.SkuNo = sku.SkuNo;
			// qualityRequest.SkuName = sku.SkuName;
			// qualityRequest.LotNo = bind.LotNo;
			// qualityRequest.SupplierLot = bind.SupplierLot;
			// qualityRequest.Qty = detail.Qty;
			// qualityRequest.SamplingQty = 0;
			// qualityRequest.ASNNo = detail.ASNNo;
			// qualityRequest.CreateUser = userId;
			// qualityRequest.CreateTime = comTime;
			// //添加质检请验单
			// Db.Insertable(qualityRequest).ExecuteCommand();
			// }
			//}
			//#endregion

			// 更改托盘使用状态
			var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
			//添加托盘记录表数据
			sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);
			//new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}、{msgStr}的组盘信息", userId);

			Db.CommitTran();
			}

	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	943 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -51,14 +51,14 @@
			void BindPalletByJc23(PdaPalletBindVm model, int userId, string origin);

			//JC23绑定物料托盘即增加库存
			public void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
			void BindPalletStock(PdaPalletBindVm model, int userId, string origin);

			/// <summary>
			/// JC26绑定托盘贴标物料
			/// </summary>
			/// <param name="model"></param>
			/// <param name="userId"></param>
			void BindPalletPasteCode(PdaPalletBindVm model, int userId);
			///// <summary>
			///// JC26绑定托盘贴标物料
			///// </summary>
			///// <param name="model"></param>
			///// <param name="userId"></param>
			//void BindPalletPasteCode(PdaPalletBindVm model, int userId);

			/// <summary>
			/// JC26绑定托盘不贴标物料