JC24WMS.git - Gitblit

			@@ -77,12 +77,13 @@
			{
			throw new Exception("单据号不可为空!");
			}
			if (model.AsnDetailNo == 0)
			{
			throw new Exception("单据明细不可为空!");
			}
			//if (model.AsnDetailNo == 0)
			//{
			// throw new Exception("单据明细不可为空!");
			//}
			//根据单据号获取入库单总单
			notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
			notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
			//notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
			if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
			{
			throw new Exception("该单据已关单!");
			@@ -96,7 +97,8 @@
			throw new Exception("批次不能为空!");
			}
			// 验证入库单明细是否存在
			detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
			detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
			//detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
			if (detail == null)
			{
			throw new Exception("当前物料及批次与单据无关联，请核实!");
			@@ -176,14 +178,14 @@
			#endregion

			//判断托盘绑定信息中是否有
			var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailNo && m.PalletNo == model.PalletNo && m.Status != "2");
			var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == detail.Id && m.PalletNo == model.PalletNo && m.Status != "2");
			var bindId = 0;
			if (bind == null)
			{
			bind = new BllPalletBind
			{
			ASNNo = model.AsnNo,
			ASNDetailNo = model.AsnDetailNo,
			ASNNo = notice.ASNNo,
			ASNDetailNo = detail.Id,
			PalletNo = model.PalletNo,
			PalletNo2 = "",
			PalletNo3 = "",
			@@ -230,8 +232,8 @@
			{
			var boxInfo = new BllBoxInfo()
			{
			ASNNo = model.AsnNo,
			ASNDetailNo = model.AsnDetailNo,
			ASNNo = notice.ASNNo,
			ASNDetailNo = detail.Id,
			OrderCode = box.OrderCode,
			BindNo = bindId,
			BoxNo = box.BoxNo,
			@@ -270,10 +272,10 @@
			}
			else if (model.Type == "0")//物料托
			{
			if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
			{
			throw new Exception($"托盘绑定明细中，含有箱码生产工单不一致");
			}
			//if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
			//{
			// throw new Exception($"托盘绑定明细中，含有箱码生产工单不一致");
			//}
			if (model.Detail.Count(m => m.SkuNo != model.SkuNo \|\| m.LotNo != model.LotNo) > 0)
			{
			throw new Exception($"托盘绑定明细中，含有箱码物料或批次不一致");
			@@ -288,8 +290,8 @@
			boxFullQty += box.Qty;
			var boxInfo = new BllBoxInfo()
			{
			ASNNo = model.AsnNo,
			ASNDetailNo = model.AsnDetailNo,
			ASNNo = detail.ASNNo,
			ASNDetailNo = detail.Id,
			OrderCode = box.OrderCode,
			BindNo = bindId,
			BoxNo = box.BoxNo,
			@@ -376,9 +378,9 @@
			// 更改托盘使用状态
			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);";
			sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{notice.ASNNo}','组盘','0',getDate(),{userId},NULL,NULL);";
			Db.Ado.ExecuteCommand(sqlStr);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", model.AsnNo, "添加", $"添加了托盘码为：{model.PalletNo}的组盘信息", userId);
			new OperationASNServer().AddLogOperationAsn("PDA模块", "托盘绑定", notice.ASNNo, "添加", $"添加了托盘码为：{model.PalletNo}的组盘信息", userId);

			Db.CommitTran();
			}
			@@ -1370,14 +1372,9 @@
			}
			roadList2.AddRange(roadLarge);
			roadList2.AddRange(roadSmall);

			roadList = roadList2;
			}
			else
			{
			roadList2 = roadList;
			}
			roadList = roadList2;


			if (roadList.Count == 0)
			{
			throw new Exception("未查询到可能使用的巷道");
			@@ -1408,14 +1405,14 @@
			roadNo = l;
			}
			//当前巷有位置则退出
			if (roadNo != null)
			if (!string.IsNullOrWhiteSpace(roadNo))
			{
			break;
			}
			}
			//如果跳巷道并且未找到合适空储位,则跳到最后一次使用的巷道查询

			if (roadNo == null)
			if (string.IsNullOrWhiteSpace(roadNo))
			{
			if (useLog != null)
			{
			@@ -1448,7 +1445,7 @@
			roadNo = item;
			}
			//当前巷有位置则退出
			if (roadNo != null)
			if (!string.IsNullOrWhiteSpace(roadNo))
			{
			break;
			}
			@@ -1621,7 +1618,7 @@



			var areaNoStr = "A07";
			var areaNoStr = "A03";
			var allotLocate = new AllotLocation();

			#region 根据sku确认区域划分
			@@ -1680,13 +1677,9 @@
			}
			roadList2.AddRange(roadLarge);
			roadList2.AddRange(roadSmall);
			}
			else
			{
			roadList2 = roadList;
			roadList = roadList2;
			}

			roadList = roadList2;
			if (roadList.Count == 0)
			{
			throw new Exception("未查询到可能使用的巷道");
			@@ -2298,7 +2291,7 @@

			SysStorageLocat locate;
			var areaList = new List<string>();
			areaList.Add("A07");
			areaList.Add("A03");
			locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);

			Db.BeginTran();
			@@ -2529,6 +2522,7 @@
			SkuName = boxInfo.SkuName,
			Standard = sku.Standard,
			ProductionTime = boxInfo.ProductionTime,
			ExpirationTime = boxInfo.ExpirationTime,
			SupplierLot = boxInfo.SupplierLot,
			InspectStatus = boxInfo.InspectStatus,
			InspectMark = boxInfo.InspectMark,
			@@ -2702,6 +2696,7 @@
			SkuName = demo.SkuName,
			Standard = noticeDetail.Standard,
			ProductionTime = demo.ProductionTime,
			ExpirationTime = demo.ExpirationTime,
			SupplierLot = demo.SupplierLot,
			InspectStatus = demo.InspectStatus,
			InspectMark = demo.InspectMark,