JC24WMS.git - Gitblit

			@@ -67,6 +67,11 @@
			{
			throw new Exception("托盘码为空，请输入托盘码");
			}
			var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
			if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
			{
			throw new Exception("该托盘还未出库");
			}
			if (type == "1")//平库出库获取单据
			{
			var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
			@@ -250,9 +255,9 @@
			//{
			// if (expr)
			// {


			// }


			//}
			var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
			if (com != null)
			@@ -308,24 +313,30 @@
			{
			throw new Exception($"{palletNo}托盘上存在箱码信息，无法在数量拣货进行操作！");
			}
			//出库单明细
			var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
			if (noticeDetail == null)

			BllExportAllot allot = null;
			if (!string.IsNullOrWhiteSpace(soDetailId))
			{
			throw new Exception($"未查询到对应出库单明细信息，请核实！");
			//出库单明细
			var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
			if (noticeDetail == null)
			{
			throw new Exception($"未查询到对应出库单明细信息，请核实！");
			}
			//出库单总单
			var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
			if (notice == null)
			{
			throw new Exception($"未查询到对应出库单总单信息，请核实！");
			}
			//分配信息
			allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" \|\| a.Status == "3"));
			if (allot == null)
			{
			throw new Exception($"未查询到对应分配信息，请核实！");
			}
			}
			//出库单总单
			var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
			if (notice == null)
			{
			throw new Exception($"未查询到对应出库单总单信息，请核实！");
			}
			//分配信息
			var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" \|\| a.Status == "3"));
			if (allot == null)
			{
			throw new Exception($"未查询到对应分配信息，请核实！");
			}

			//库存明细
			var detail = Db.Queryable<DataStockDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo);
			if (detail == null)
			@@ -341,8 +352,8 @@
			{
			SkuNo = detail.SkuNo,
			BoxNo = detail.SkuNo,
			Qty = (int)allot.Qty,
			PickedQty = (int)allot.CompleteQty,
			Qty = allot == null ? (int)(detail.Qty - detail.LockQty) : (int)allot.Qty,
			PickedQty = allot == null ? 0 : (int)allot.CompleteQty,
			};

			pdaInfo.Add(info);
			@@ -441,7 +452,7 @@
			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}
			@@ -606,7 +617,7 @@
			}
			}
			var pickQty = 0;//拣货的数量


			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			@@ -637,7 +648,7 @@
			if (biaoShi != "2")
			{
			//删除库存箱码明细
			Db.Deleteable(item).ExecuteCommand();
			Db.Deleteable(item).ExecuteCommand();
			}
			else//数量拣货
			{
			@@ -826,6 +837,7 @@

			var comList = new List<BllCompleteDetail>();
			//判断是否存在拣货明细
			isComplete = 0;// 所有无箱码或一级箱码拣货时，拣货明细应重新插入数据(体现多次拣货流程记录)
			if (isComplete == 0)
			{
			//添加拣货明细
			@@ -864,8 +876,6 @@

			Db.Updateable(complete).ExecuteCommand();
			}



			//修改出库分配信息
			allot.CompleteQty += int.Parse(PickQty);
			@@ -925,7 +935,7 @@
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			}


			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += int.Parse(PickQty);
			Db.Updateable(noticeDetail).ExecuteCommand();
			@@ -1320,25 +1330,25 @@
			{
			var type = "";
			var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
			if (detail== null)
			if (detail == null)
			{
			throw new Exception("当前托盘未在库存中");
			}
			//怎么判断当前托盘是库外要取样的托盘，正常出库剩余托盘目前这种情况也能拣货啊，也没有分配信息
			var allot = Db.Queryable<BllExportAllot>().First(m =>
			m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
			if (allot!=null)
			if (allot != null)
			{
			var soNo = Db.Queryable<BllExportNotice>()
			.First(m => m.IsDel == "0" && m.SONo == allot.SONo);
			if (soNo == null)
			{
			throw new Exception("未找到托盘上出库单据信息");
			}
			}
			if (soNo.Type != "3")
			{
			throw new Exception("该托盘不是取样托盘");
			}
			}
			type = "0";//库内取样
			}
			else
			@@ -1381,7 +1391,7 @@
			}

			//取样出库拣货(标签)
			public void SampleSoSetPick(string soType,string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
			public void SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
			{
			Db.BeginTran();
			try
			@@ -1390,7 +1400,7 @@
			{
			throw new Exception("取样标识不能为空");
			}


			//soType: 0库内取样，有出库单及分配信息； 1库前取样，反向添加出库单及分配信息
			if (soType == "1")
			{
			@@ -1400,7 +1410,7 @@
			if (string.IsNullOrWhiteSpace(asnNo))
			{
			throw new Exception("入库单不能为空");
			}
			}
			if (string.IsNullOrWhiteSpace(palletNo))
			{
			throw new Exception("托盘码不能为空");
			@@ -1425,7 +1435,7 @@
			throw new Exception("未查询到该托盘的库存明细信息！");
			}

			var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
			if (sku == null)
			{
			throw new Exception("未查询到当前托盘上的物料信息");
			@@ -1440,7 +1450,7 @@
			//出库单
			var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.AsnSampleNo == asnNo);
			//创建出库单
			if (notice == null \|\| notice.Status == "6")
			if (notice == null \|\| notice.Status == "6")
			{
			var billNo = "";
			var bl = true;
			@@ -1452,7 +1462,7 @@
			bl = Db.Queryable<BllExportNotice>().Any(m => m.SONo == no);
			} while (bl);



			var addNotice = new BllExportNotice()
			{
			SONo = billNo,
			@@ -1464,7 +1474,7 @@
			WaveNo = "",
			IsDespatch = "0",
			CompleteTime = DateTime.Now,
			CreateUser = userId,
			CreateUser = userId,
			};

			var n = Db.Insertable(addNotice).ExecuteReturnEntity();
			@@ -1498,7 +1508,7 @@
			IsIssueLotNo = "0",
			Status = "3",
			CreateUser = userId,


			};
			var m = Db.Insertable(addNoticeDetail).ExecuteReturnEntity();
			noticeDetail = m;
			@@ -1521,8 +1531,8 @@
			SkuName = sku.SkuName,
			Standard = sku.Standard,
			PalletNo = palletNo,
			IsBale = "0" , //是否裹包
			IsBelt = "0" , //是否打带
			IsBale = "0", //是否裹包
			IsBelt = "0", //是否打带

			Qty = 0,
			CompleteQty = 0,
			@@ -1539,7 +1549,7 @@
			var fp = Db.Insertable(addAllot).ExecuteReturnEntity();
			allot2 = fp;
			}



			#endregion

			@@ -1613,7 +1623,7 @@
			}
			}
			var pickQty = 0;//拣货的数量


			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			@@ -1668,7 +1678,7 @@
			}
			pickQty += biaoShi == "2" ? int.Parse(pickQty1) : item.Qty;
			}



			//改变库内箱码是否零箱信息
			if (biaoShi == "1")
			@@ -1685,13 +1695,13 @@
			Db.Insertable(comList).ExecuteCommand();
			//修改出库分配信息
			allot2.Qty += pickQty;
			allot2.CompleteQty += pickQty;
			allot2.CompleteQty += pickQty;
			Db.Updateable(allot2).ExecuteCommand();

			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= pickQty;


			if (stockDetail.Qty <= 0)
			{
			Db.Deleteable(stockDetail).ExecuteCommand();
			@@ -1730,7 +1740,7 @@
			Db.Updateable(noticeDetail).ExecuteCommand();

			}
			else if(soType == "0")
			else if (soType == "0")
			{
			#region 判断

			@@ -1876,7 +1886,7 @@
			}
			}
			var pickQty = 0;//拣货的数量


			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			@@ -2205,7 +2215,7 @@
			SkuName = allot2.SkuName,
			Standard = allot2.Standard,
			PalletNo = palletNo,
			CompleteQty = int.Parse(PickQty) ,
			CompleteQty = int.Parse(PickQty),
			InspectMark = "1",

			CreateUser = userId
			@@ -2228,7 +2238,7 @@

			//修改出库分配信息
			allot2.Qty += int.Parse(PickQty);
			allot2.CompleteQty += int.Parse(PickQty);
			allot2.CompleteQty += int.Parse(PickQty);
			Db.Updateable(allot2).ExecuteCommand();

			int isDel = 0;
			@@ -2237,7 +2247,7 @@
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.InspectMark = "1";//修改为抽检托标识
			stockDetail.Qty -= int.Parse(PickQty);
			if (stockDetail.Qty == stockDetail.LockQty&& stockDetail.Qty != 0)
			if (stockDetail.Qty == stockDetail.LockQty && stockDetail.Qty != 0)
			{
			stockDetail.Status = "2";
			}
			@@ -2290,7 +2300,7 @@
			noticeDetail.CompleteQty += int.Parse(PickQty);
			noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;
			Db.Updateable(noticeDetail).ExecuteCommand();


			}
			else if (soType == "0")
			{
			@@ -2505,7 +2515,7 @@
			/// <param name="pickQty1"></param>
			/// <param name="palletNoNew"></param>
			/// <param name="userId"></param>
			public void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1,string palletNoNew,int userId)
			public void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string palletNoNew, int userId)
			{
			Db.BeginTran();
			try
			@@ -2532,6 +2542,13 @@
			if (string.IsNullOrWhiteSpace(palletNoNew))
			{
			throw new Exception("新托盘码不能为空");
			}
			if (palletNo == palletNoNew)//原托盘与新托盘一致
			{
			if (!string.IsNullOrEmpty(boxNo))
			{
			throw new Exception("原托盘与新托盘一致，请选择整托出库");
			}
			}

			//出库单
			@@ -2583,13 +2600,16 @@
			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
			if (pinStockDetail != null)
			{
			if (pinStockDetail.SONo != notice.SONo)
			if (palletNo != palletNoNew)//非整托拣货
			{
			throw new Exception("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			if (pinStockDetail.SONo != notice.SONo)
			{
			throw new Exception("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}
			sdId = pinStockDetail.Id;
			}
			@@ -2597,7 +2617,7 @@
			{
			isNew = true;

			var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status=="0");
			var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
			if (newPalletInfo == null)
			{
			throw new Exception("新托盘信息不存在或已被使用！");
			@@ -2615,7 +2635,7 @@
			sd.SkuNo = stockDetail.SkuNo;
			sd.SkuName = stockDetail.SkuName;
			sd.Standard = stockDetail.Standard;


			sd.FrozenQty = 0;
			sd.InspectQty = 0;
			sd.ASNNo = "";
			@@ -2653,7 +2673,7 @@
			sdId = Db.Insertable(sd).ExecuteReturnIdentity();
			}
			#endregion


			var pickQty = 0;//拣货的数量
			if (string.IsNullOrWhiteSpace(boxNo))//整托拣货
			{
			@@ -2705,11 +2725,15 @@
			CreateUser = userId
			};
			comList.Add(completeDetail);


			if (palletNo != palletNoNew)
			{
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			}
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			//修改库存箱码明细
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2721,17 +2745,27 @@
			allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
			allot.UpdateTime = DateTime.Now;
			Db.Updateable(allot).ExecuteCommand();
			//删除原托盘库存明细
			Db.Deleteable(stockDetail).ExecuteCommand();

			//改变托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			if (palletNo != palletNoNew)
			{
			throw new Exception("未在托盘表中查询到托盘信息");
			//删除原托盘库存明细
			Db.Deleteable(stockDetail).ExecuteCommand();

			//改变原托盘状态为：未使用
			var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
			if (pallet == null)
			{
			throw new Exception("未在托盘表中查询到托盘信息");
			}
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			}
			pallet.Status = "0";
			Db.Updateable(pallet).ExecuteCommand();
			else
			{
			stockDetail.SONo = soNo;
			Db.Updateable(stockDetail).ExecuteCommand();
			}

			//修改出库单明细拣货数量
			noticeDetail.CompleteQty += pickQty;
			Db.Updateable(noticeDetail).ExecuteCommand();
			@@ -2866,6 +2900,7 @@
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2877,7 +2912,8 @@
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.BoxNo = item.BoxNo3;//将支码赋给箱码
			item.BitBoxMark = "1";
			item.BitBoxMark = "1";//零箱标记
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();

			pickQty += item.Qty;
			@@ -2890,6 +2926,7 @@
			item.StockDetailId = sdId;
			item.BindNo = null;//托盘绑定号
			item.PalletNo = palletNoNew;
			item.Status = "5";//箱支状态，0：未组托 1：已组托 2：已入库 3：已出库 4:已分配 5：已拣货
			Db.Updateable(item).ExecuteCommand();
			}
			else
			@@ -2982,10 +3019,13 @@
			}
			else
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += pickQty;
			pinStockDetail.LockQty += pickQty;
			Db.Updateable(pinStockDetail).ExecuteCommand();
			if (palletNo != palletNoNew)
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += pickQty;
			pinStockDetail.LockQty += pickQty;
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			}

			//添加操作日志记录
			@@ -3007,7 +3047,7 @@
			/// <param name="PickQty"></param>
			/// <param name="palletNoNew"></param>
			/// <param name="userId"></param>
			public void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty,string palletNoNew, int userId)
			public void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId)
			{
			Db.BeginTran();
			try
			@@ -3076,6 +3116,13 @@
			{
			throw new Exception("未查询到该托盘分配的库存信息！");
			}
			if (palletNo == palletNoNew)//原托盘与新托盘一致
			{
			if (int.Parse(PickQty) != stockDetail.Qty)
			{
			throw new Exception("原托盘与新托盘一致，需要把托盘上所有数量拣货");
			}
			}
			#endregion

			#region 拼托信息
			@@ -3083,13 +3130,16 @@
			var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
			if (pinStockDetail != null)
			{
			if (pinStockDetail.SONo != notice.SONo)
			if (palletNo != palletNoNew)//非整托拣货
			{
			throw new Exception("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			if (pinStockDetail.SONo != notice.SONo)
			{
			throw new Exception("拼托托盘上只能放同一个出库单下的物料！");
			}
			if (pinStockDetail.SkuName != stockDetail.SkuName \|\| pinStockDetail.LotNo != stockDetail.LotNo)
			{
			isNew = true;
			}
			}
			}
			else
			@@ -3105,7 +3155,7 @@
			newPalletInfo.Status = "1";
			Db.Updateable(newPalletInfo).ExecuteCommand();
			}


			if (isNew)
			{
			var sd = new DataStockDetail();
			@@ -3158,10 +3208,18 @@
			}
			else
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += int.Parse(PickQty);
			pinStockDetail.LockQty += int.Parse(PickQty);
			Db.Updateable(pinStockDetail).ExecuteCommand();
			if (palletNo != palletNoNew)
			{
			//修改拼托托盘库存明细
			pinStockDetail.Qty += int.Parse(PickQty);
			pinStockDetail.LockQty += int.Parse(PickQty);
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			else
			{
			pinStockDetail.SONo = soNo;
			Db.Updateable(pinStockDetail).ExecuteCommand();
			}
			}
			#endregion

			@@ -3177,6 +3235,7 @@

			var comList = new List<BllCompleteDetail>();
			//判断是否存在拣货明细
			isComplete = 0;//所有无箱码或一级箱码拣货时，拣货明细应重新插入数据(体现多次拣货流程记录)
			if (isComplete == 0)
			{
			//添加拣货明细
			@@ -3224,32 +3283,38 @@

			int isDel = 0;

			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			stockDetail.LockQty -= int.Parse(PickQty);
			if (stockDetail.Qty == stockDetail.LockQty)
			if (palletNo != palletNoNew)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}
			if (stockDetail.Qty <= 0)
			{
			Db.Deleteable(stockDetail).ExecuteCommand();
			//删除或修改库存明细
			stockDetail.BitPalletMark = "1";//修改为零托标识
			stockDetail.Qty -= int.Parse(PickQty);
			stockDetail.LockQty -= int.Parse(PickQty);
			if (stockDetail.Qty == stockDetail.LockQty)
			{
			stockDetail.Status = "2";
			}
			else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
			{
			stockDetail.Status = "1";
			}
			else
			{
			stockDetail.Status = "0";
			}
			if (stockDetail.Qty <= 0)
			{
			Db.Deleteable(stockDetail).ExecuteCommand();
			}
			else
			{
			isDel = 1;
			Db.Updateable(stockDetail).ExecuteCommand();
			}
			}
			else
			{
			isDel = 1;
			Db.Updateable(stockDetail).ExecuteCommand();
			}

			//判断托盘上物料是否拣货完毕
			if (isDel == 0)
			{