JC24WMS.git - Gitblit

			@@ -41,7 +41,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public bool ErpAddExportNotice(SoInfo model)
			public void HttpAddExportNotice(SoInfo model)
			{
			try
			{
			@@ -226,7 +226,7 @@
			SONo = billNo,
			Type = model.SoType,
			Status = "0",
			Origin = "WMS",
			Origin = model.Origin,
			CustomerNo = model.Customer,
			CustomerName = customer.CustomerName,
			LogisticsId = logisticsId,
			@@ -242,12 +242,10 @@

			if (n <= 0 \|\| m <= 0)
			{
			Db.RollbackTran();
			return false;
			throw new Exception("入库单或明细添加保存失败");
			}
			Db.CommitTran();
			return true;


			}
			catch (Exception ex)
			{
			@@ -259,7 +257,6 @@
			}
			catch (Exception ex)
			{
			Db.RollbackTran();
			throw new Exception(ex.Message);
			}
			}
			@@ -363,31 +360,31 @@
			.LeftJoin<SysUserInfor>((a, b, c, d, e) => a.CheckUser == e.Id)
			.Select((a, b, c, d, e) => new ExportNoticeDto()
			{
			Id = a.Id,
			SONo = a.SONo,
			Type = a.Type,
			Status = a.Status,
			Origin = a.Origin,
			CustomerNo = a.CustomerNo,
			CustomerName = a.CustomerName,
			LotNo = a.LotNo,
			LotText = a.LotText,
			SupplierLot = a.SupplierLot,
			LogisticsId = a.LogisticsId,
			//Id = a.Id,
			//SONo = a.SONo,
			//Type = a.Type,
			//Status = a.Status,
			//Origin = a.Origin,
			//CustomerNo = a.CustomerNo,
			//CustomerName = a.CustomerName,
			//LotNo = a.LotNo,
			//LotText = a.LotText,
			//SupplierLot = a.SupplierLot,
			//LogisticsId = a.LogisticsId,
			LogisticsName = b.CarrierName,
			IsWave = a.IsWave,
			WaveNo = a.WaveNo,
			IsDespatch = a.IsDespatch,
			Demo = a.Demo,
			//IsWave = a.IsWave,
			//WaveNo = a.WaveNo,
			//IsDespatch = a.IsDespatch,
			//Demo = a.Demo,

			CreateUserName = c.RealName,
			UpdateUserName = c.RealName,
			CreateTime = a.CreateTime,
			UpdateTime = a.UpdateTime,
			//CreateTime = a.CreateTime,
			//UpdateTime = a.UpdateTime,

			CheckUserName = e.RealName,
			CheckTime = a.CheckTime
			})
			//CheckTime = a.CheckTime
			},true)
			.OrderByDescending(a => a.CreateTime)
			.ToOffsetPage(page, limit, ref total);
			count = total;
			@@ -436,16 +433,16 @@
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			skuType = "(0,1,2,3)";
			skuType = "(0,1,2,3,4)";
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			skuType = "(4)";
			inspectStatus = "0,1";
			inspectStatus = "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)";
			@@ -478,6 +475,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 != "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"))
			@@ -2163,6 +2161,10 @@
			{
			str += "3.要出库的托盘正在入库、";
			}
			if (string.IsNullOrWhiteSpace(str))
			{
			str += "托盘可执行，无需下发出库任务";
			}
			if (outDto1.Count > 0)
			{
			// 正式运行程序放开
			@@ -2172,23 +2174,23 @@

			try
			{
			//var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			//response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			//var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

			//////解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			//if (wcsModel.StatusCode == 0)
			//{
			// //更改任务的发送返回时间//
			// new TaskServer().EditTaskIssueOk(list2, time1, time2);
			// str += "下发成功";
			//}
			//if (wcsModel.StatusCode == -1)
			//{
			// new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			// throw new Exception(wcsModel.Msg);
			//}
			if (wcsModel.StatusCode == 0)
			{
			//更改任务的发送返回时间//
			new TaskServer().EditTaskIssueOk(list2, time1, time2);
			str += "下发成功";
			}
			if (wcsModel.StatusCode == -1)
			{
			new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
			throw new Exception(wcsModel.Msg);
			}
			}
			catch (Exception ex)
			{
			@@ -3215,26 +3217,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)
			@@ -3282,29 +3321,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();
			@@ -3313,7 +3359,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;
			@@ -3350,7 +3396,7 @@
			IsBelt = stock.IsBelt,
			Qty = st.Qty,
			CompleteQty = 0,
			Status = "0",
			Status = notice.Status == "4"? "2":"0",
			LogisticsId = notice.LogisticsId,
			IsAdvance = "0",
			OutMode = "",//出库口
			@@ -3369,11 +3415,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;