JC24WMS.git - Gitblit

			@@ -49,11 +49,11 @@
			{
			throw new Exception("单据类型不可为空!");
			}
			if (string.IsNullOrEmpty(model.Customer))
			{
			throw new Exception("客户不可为空!");
			}
			if (string.IsNullOrEmpty(model.OrderCode))
			//if (string.IsNullOrEmpty(model.Customer))
			//{
			// throw new Exception("客户不可为空!");
			//}
			if (string.IsNullOrEmpty(model.OrderNo))
			{
			throw new Exception("系统单号不可为空!");
			}
			@@ -68,10 +68,10 @@

			//客户信息
			var customer = Db.Queryable<SysCustomer>().First(m => m.IsDel == "0" && m.CustomerNo == model.Customer);
			if (customer == null)
			{
			throw new Exception("客户不可为空!");
			}
			//if (customer == null)
			//{
			// throw new Exception("客户不可为空!");
			//}
			var logistics = Db.Queryable<SysLogisticsInfo>().First(m => m.IsDel == "0" && m.CarrierName == model.LogisticsNo);
			int? logisticsId = null;
			if (logistics != null)
			@@ -127,8 +127,9 @@
			}
			if (qty > d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(stocks.First().Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			@@ -149,10 +150,11 @@
			}
			var q2 = demo.Qty - demo.LockQty - demo.FrozenQty;

			if (q2 > d.Qty - q1)
			if (q2 >= d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(demo.Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			@@ -161,7 +163,7 @@
			}

			}
			if (d.Qty >= q1)
			if (d.Qty > q1)
			{
			stocks = stockList.Where(s => s.SkuNo == d.SkuNo && string.IsNullOrWhiteSpace(s.LotNo)).ToList();
			if (stocks.Count == 0)
			@@ -169,10 +171,11 @@
			throw new Exception($"总库存中出库物料信息:{d.SkuNo}库存数量不足");
			}
			var q2 = stocks.First().Qty - stocks.First().LockQty - stocks.First().FrozenQty;
			if (q2 > d.Qty - q1)
			if (q2 >= d.Qty - q1)
			{
			q1 += d.Qty - q1;
			dic.Add(stocks.First().Id, d.Qty - q1);

			q1 += d.Qty - q1;
			}
			else
			{
			@@ -227,8 +230,8 @@
			Type = model.SoType,
			Status = "0",
			Origin = model.Origin,
			CustomerNo = model.Customer,
			CustomerName = customer.CustomerName,
			//CustomerNo = model.Customer,
			//CustomerName = customer.CustomerName,
			LogisticsId = logisticsId,
			IsWave = "0",
			WaveNo = "",
			@@ -262,10 +265,22 @@
			}

			//回传出库单
			public bool FinishSo(int id, string url, int userId)
			public bool FinishSo(int id, string url, string userNo, string pwd, int userId)
			{
			try
			{
			var loginPwd = Md5Tools.CalcMd5(pwd);
			var date = Db.Queryable<SysUserInfor>().First(m => m.IsDel == "0" && m.UserName == userNo && m.PassWord == loginPwd);

			if (date == null) //账号密码是否正确
			{
			throw new Exception("账号密码不正确或没有此账号");
			}
			if (date.Status != "0") //当前账号是否正常启用
			{
			throw new Exception("当前账号非启用状态");
			}

			var notice = Db.Queryable<BllExportNotice>().First(m => m.Id == id && m.IsDel == "0");
			if (notice == null)
			{
			@@ -280,7 +295,7 @@
			{
			throw new Exception("未查询到单据明细信息");
			}
			if (userId == notice.UpdateUser)
			if (date.Id == notice.UpdateUser)
			{
			throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
			}
			@@ -297,7 +312,7 @@
			}
			var soInfo = new SoInfo()
			{
			OrderCode = notice.OrderCode,
			OrderNo = notice.OrderCode,
			SoDetails = list
			};
			#region 通过接口发送至erp
			@@ -315,10 +330,10 @@

			notice.Status = "6";
			notice.CheckTime = DateTime.Now;
			notice.CheckUser = userId;
			notice.CheckUser = date.Id;
			Db.Updateable(notice).ExecuteCommand();

			new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "复核", $"复核了单据号为{notice.SONo}的单据信息", userId);
			new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "复核", $"{date.RealName}复核了单据号为{notice.SONo}的单据信息", userId);
			return true;
			}
			catch (Exception e)
			@@ -433,7 +448,7 @@
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			skuType = "(0,1,2,3)";
			skuType = "(0,1,2,3,4)";
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			@@ -441,8 +456,8 @@
			inspectStatus = "0,1";
			break;
			case "6"://代储出库
			skuType = "(0,1,2,3)";
			inspectStatus = "0,1";
			skuType = "(0,1,2,3,4)";
			inspectStatus = "0,1,2";
			break;
			case "8"://寄存出库
			skuType = "(0,1,2,3)";
			@@ -475,7 +490,7 @@
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
			.And(m => skuList.Contains(m.SkuNo))
			.AndIF(type == "6", m => m.OwnerNo == ownerNo)//代储出库需要关联货主
			.AndIF(type == "2", m=> string.IsNullOrWhiteSpace(m.OwnerNo))
			.AndIF(type != "6", m=> string.IsNullOrWhiteSpace(m.OwnerNo))
			.AndIF(!string.IsNullOrWhiteSpace(msg), it => (it.SkuNo.Contains(msg) \|\| it.SkuName.Contains(msg) \|\| it.LotNo.Contains(msg)))
			.And(it => (it.Qty - it.LockQty - it.FrozenQty) > 0)
			.And(it => (it.Status == "0" \|\| it.Status == "1"))
			@@ -1231,9 +1246,9 @@
			{
			throw new Exception("未查询到出库单据信息");
			}
			if (notice.Status != "4")
			if (notice.Status != "4" && notice.Status != "3")
			{
			throw new Exception("参数异常,请检查状态是否为执行完成或订单关闭");
			throw new Exception("参数异常,请检查状态是否为正在执行或执行完成");
			}
			//总库存信息
			var stockList = Db.Queryable<DataStock>().ToList();
			@@ -1254,64 +1269,67 @@

			foreach (var d in noticeDetail)
			{
			//更改库存明细锁定数量
			//var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id
			// && o.ExportExecuteFlag != "4" && o.ExportExecuteFlag == "3" && o.pickingType == 0).ToList();
			//foreach (var o in orders)
			//{
			// if (o.ExportQuantity > o.PickedNum) //判断拣货是否已拣完
			// {
			// var pq = dataContext.WmsStockTray.Where(t => t.StockGoodId == o.ExportGoodsCode && t.StockStockCode == o.ExportStockCode);

			// if (string.IsNullOrWhiteSpace(o.ExportLotNo))
			// {
			// pq = pq.Where(t => t.StockLotNo == null \|\| t.StockLotNo == "");
			// }
			// else
			// {
			// pq = pq.Where(t => t.StockLotNo == o.ExportLotNo);
			// }
			// var pallet = pq.FirstOrDefault();
			// //库存托盘信息锁定数量还原为未锁定
			// if (pq != null)
			// {
			// pallet.LockQuantity -= o.ExportQuantity.Value - o.PickedNum;
			// pallet.StockQuantity += o.ExportQuantity.Value - o.PickedNum;
			// }
			// }
			//}

			if (d.Qty != d.CompleteQty)
			if (notice.Type == "0")//成品出库
			{
			throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
			}
			#region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
			/*var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
			if (!string.IsNullOrWhiteSpace(d.LotNo))
			{
			sq = sq.Where(s => s.LotNo == d.LotNo);
			}
			else
			{
			sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
			}
			var st = sq.FirstOrDefault();
			if (st != null)
			{
			if (d.CompleteQty <= d.Qty)
			if (d.Qty != d.CompleteQty)
			{
			st.Qty += d.Qty - d.CompleteQty.Value;
			throw new Exception("当前单据明细中计划数量与拣货数量不符，请核实");
			}
			}
			if (d.Qty < d.CompleteQty)
			{
			//更改库存明细锁定数量
			var allotList = Db.Queryable<BllExportAllot>().Where(o => o.SODetailNo == d.Id && o.Status == "3" && o.IsDel == "0").ToList();
			foreach (var o in allotList)
			{
			if (o.Qty > o.CompleteQty) //判断拣货是否已拣完
			{
			var pq = Db.Queryable<DataStockDetail>().Where(t => t.IsDel == "0" && t.Id == o.StockId && t.SkuNo == o.SkuNo);

			if (string.IsNullOrWhiteSpace(o.LotNo))
			{
			pq = pq.Where(t => string.IsNullOrWhiteSpace(t.LotNo));
			}
			else
			{
			pq = pq.Where(t => t.LotNo == o.LotNo);
			}
			var pallet = pq.First();
			//库存托盘信息锁定数量还原为未锁定
			if (pq != null)
			{
			//pallet.Qty -= o.CompleteQty.Value - o.Qty;
			pallet.LockQty -= o.Qty - o.CompleteQty.Value;
			Db.Updateable(pallet).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
			}
			}
			}


			#region 库存表减去锁定数量与总数量(PDA拣货的时候已经减去数量了)
			var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
			if (!string.IsNullOrWhiteSpace(d.LotNo))
			{
			sq = sq.Where(s => s.LotNo == d.LotNo);
			}
			else
			{
			st.Qty -= d.CompleteQty.Value - d.Qty;
			sq = sq.Where(s => string.IsNullOrWhiteSpace(s.LotNo));
			}
			st.LockQty -= d.Qty;
			st.Qty -= d.Qty;
			//修改总库存表
			Db.Updateable(st).UpdateColumns(it => new { it.Qty, it.LockQty }).ExecuteCommand();
			}*/
			#endregion
			if (notice.Type == "6")//代储
			{
			sq = sq.Where(s => s.OwnerNo == notice.CustomerNo);
			}
			var st = sq.FirstOrDefault();
			if (st != null)
			{
			st.LockQty -= d.Qty - d.CompleteQty.Value;
			//修改总库存表
			Db.Updateable(st).UpdateColumns(it => new { it.LockQty }).ExecuteCommand();
			}
			#endregion
			}

			}
			//添加操作日志记录
			var k = new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "关单", $"关闭了单据号为{notice.SONo}的单据信息", userId);
			@@ -3217,26 +3235,63 @@
			{
			throw new Exception("获取失败，未找到指定出库单！");
			}
			if (detail.Status != "0" && detail.Status != "1" && detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单状态不是等待执行或分配中！");
			}
			if (detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单已分配完成!");
			}

			var notice = Db.Queryable<BllExportNotice>().First(a => a.SONo == detail.SONo);
			if (notice == null)
			{
			throw new Exception("获取失败，未找到指定出库单!");
			}
			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			if (notice.Type != "1" && notice.Type != "2" && notice.Type != "3")
			{
			throw new Exception("获取失败，出库单状态不允许!");
			if (detail.Status != "0" && detail.Status != "1" && detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单状态不是等待执行或分配中！");
			}
			if (detail.AllotQty >= detail.Qty)
			{
			throw new Exception("获取失败，出库单已分配完成!");
			}

			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			{
			throw new Exception("获取失败，出库单状态不允许!");
			}
			}
			string inspectStatus = string.Empty;
			switch (notice.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
			{
			case "0"://成品出库
			inspectStatus = "1";
			break;
			case "1"://领料出库
			inspectStatus = "1";
			break;
			case "2"://抽检出库
			inspectStatus = "0,1,2";
			break;
			case "3"://物料取样出库
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			inspectStatus = "1";
			break;
			case "6"://代储出库
			inspectStatus = "0,1,2";
			break;
			case "8"://寄存出库
			inspectStatus = "0,1";
			break;
			default: //其它出库
			inspectStatus = "0,1";
			break;
			}
			#endregion

			Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), m => inspectStatus.Contains(m.InspectStatus))
			.AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
			.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
			.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)
			@@ -3284,29 +3339,36 @@
			{
			throw new Exception("操作失败，未找到指定出库单详情！");
			}
			if (detail.AllotQty >= detail.Qty \|\| (detail.Status != "0" && detail.Status != "1"))
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}
			var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == detail.SONo);
			if (notice == null)
			{
			throw new Exception("操作失败，未找到指定出库单！");
			}
			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			if (notice.Type != "1" && notice.Type != "2" && notice.Type !="3")
			{
			throw new Exception("操作失败，出库单已分配完成！");
			if (detail.AllotQty >= detail.Qty \|\| (detail.Status != "0" && detail.Status != "1"))
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}

			if (notice.Status == "3" && detail.AllotQty >= detail.Qty \|\| notice.Status == "4" \|\| notice.Status == "5")
			{
			throw new Exception("操作失败，出库单已分配完成！");
			}

			//单据明细需要的出库数量
			var needQty = detail.Qty - detail.AllotQty;
			//分配的出库数量
			var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
			if (outQty < needQty)
			{
			throw new Exception("操作失败，出库数量不能大于计划数量！");
			}
			}

			#endregion

			//单据明细需要的出库数量
			var needQty = detail.Qty - detail.AllotQty;
			//分配的出库数量
			var outQty = model.StockList.Select(s => s.Qty).ToList().Sum();
			if (outQty != needQty)
			{
			throw new Exception("操作失败，出库数量与计划数量不一致！");
			}

			var stockIds = model.StockList.Select(a => a.StockId).ToList();
			//库存明细
			var stockList = Db.Queryable<DataStockDetail>().Where(a => stockIds.Contains(a.Id)).ToList();
			@@ -3315,7 +3377,7 @@
			var allots = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SODetailNo == detail.Id && m.Status == "0").ToList();

			//库存总表
			//var stockz = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);
			var stockz = Db.Queryable<DataStock>().First(d => d.IsDel == "0" && d.SkuNo == detail.SkuNo && d.LotNo == detail.LotNo);

			var allotList = new List<BllExportAllot>();
			decimal outQtys = 0;
			@@ -3352,7 +3414,7 @@
			IsBelt = stock.IsBelt,
			Qty = st.Qty,
			CompleteQty = 0,
			Status = "0",
			Status = notice.Status == "4"? "2":"0",
			LogisticsId = notice.LogisticsId,
			IsAdvance = "0",
			OutMode = "",//出库口
			@@ -3371,11 +3433,12 @@
			//库存明细
			stock.LockQty += st.Qty;
			stock.Status = stock.LockQty == stock.Qty ? "2" : "1";

			//库存总表
			//stockz.LockQty += st.Qty;
			//Db.Updateable(stockz).ExecuteCommand();

			if (detail.AllotQty+ st.Qty > detail.Qty)
			{
			//库存总表
			stockz.LockQty += (decimal)detail.AllotQty + st.Qty - detail.Qty;
			Db.Updateable(stockz).ExecuteCommand();
			}

			Db.Updateable(stock).UpdateColumns(it => new { it.LockQty, it.Status }).ExecuteCommand();
			outQtys += st.Qty;