JC34WMS.git - Gitblit

			@@ -1,5 +1,6 @@
			using Model.InterFaceModel;
			using Model.ModelDto;
			using Model.ModelDto.BllAsnDto;
			using Model.ModelDto.SysDto;
			using Model.ModelVm;
			using Model.ModelVm.SysVm;
			@@ -119,6 +120,7 @@
			Status = tb1.Status,
			AsnType = tb2.Type,
			AsnStatus = tb2.Status,
			IsPasteCode = tb5.IsPasteCode,
			Lot1 = tb1.Lot1,
			Lot2 = tb1.Lot2,
			UDF1 = tb1.UDF1,
			@@ -137,7 +139,7 @@
			}

			//获取入库单明细剩余打印数量
			public string GetAsnDetailQtyList(int id)
			public LabelPrintInfoDto GetAsnDetailQtyList(int id)
			{
			try
			{
			@@ -146,11 +148,23 @@
			{
			throw new Exception("未查询到入库单明细");
			}
			var data = new LabelPrintInfoDto();

			data.ProductionTime = string.IsNullOrEmpty(detail.Lot1) ? "" : Convert.ToDateTime(detail.Lot1).ToString("yyyy-MM-dd");
			data.ExpirationTime = string.IsNullOrEmpty(detail.Lot2) ? "" : Convert.ToDateTime(detail.Lot2).ToString("yyyy-MM-dd");
			data.SupplierLot = detail.SupplierLot;
			var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty + (m.SamplingQty == null? 0: m.SamplingQty));
			if (labelQty == null)
			{
			labelQty = 0;
			}
			var qty = detail.Qty - labelQty;

			return qty.ToString();
			if (qty<0)
			{
			qty = 0;
			}
			data.Qty = qty.ToString();
			return data;
			}
			catch (Exception e)
			{
			@@ -249,11 +263,11 @@
			string strMessage = "";

			/** model.type （单据类型)
			* 成品入库 0
			* 成品入库 0
			* 采购入库 1
			* 中间品不贴 2
			* 退货入库 3
			* 退货入库 3
			* 余料退回入库 4
			* 生产退料入库 8
			*/
			var TypeLot = "1, 5, 6, 7"; //批次可为空单据类型

			@@ -293,6 +307,8 @@
			};

			List<BllArrivalNoticeDetail> details = new List<BllArrivalNoticeDetail>();
			var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();

			foreach (ArrivalNoticeDetailVm detailModel in model.AsnDetail)
			{
			if (string.IsNullOrEmpty(detailModel.SkuNo))
			@@ -310,8 +326,8 @@
			strMessage = "-1:数量必须大于0;";
			continue;
			}

			if (model.Type == "1" \|\| model.Type == "5" \|\| model.Type == "6" \|\| model.Type == "7")

			if ( model.Type == "5" \|\| model.Type == "6" \|\| model.Type == "7")
			{
			if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
			{
			@@ -343,12 +359,27 @@
			detailModel.LotNo = maxLotNo;
			}
			}
			if (model.Type == "0" \|\| model.Type == "2" \|\| model.Type == "3" \|\| model.Type == "4")
			//if (model.Type == "0" \|\| model.Type == "1" \|\| model.Type == "2" \|\| model.Type == "3" \|\| model.Type == "4" && model.Type == "8")
			//{
			// if (string.IsNullOrWhiteSpace(detailModel.LotNo))
			// {
			// throw new Exception("当前单据类型批次不可为空!");
			// }
			//}
			detailModel.BoxCodeStr = detailModel.LotNo;
			if (string.IsNullOrWhiteSpace(detailModel.LotNo))
			{
			if (string.IsNullOrWhiteSpace(detailModel.LotNo))
			string toDayTime = DateTime.Now.ToString("yyyyMM");
			var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
			if(string.IsNullOrWhiteSpace(maxBoxCodeStr))
			{
			throw new Exception("当前单据类型批次不可为空!");
			maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
			}
			else
			{
			maxBoxCodeStr = "BK" + (int.Parse(maxBoxCodeStr.Replace("BK", "")) + 1).ToString();
			}
			detailModel.BoxCodeStr = maxBoxCodeStr;
			}

			// 判断是否已存在当前明细
			@@ -367,6 +398,33 @@
			{
			detailModel.Price = 0;
			}
			var sku = skuList.FirstOrDefault(m => m.SkuNo == detailModel.SkuNo);
			if (sku == null)
			{
			throw new Exception("未查询出物料信息!");
			}
			string lot1 = detailModel.Lot1;
			string lot2 = detailModel.Lot2;
			if (sku.IsPasteCode == "0")
			{
			//不贴标物料生产日期、有效期不能为空
			DateTime lot12;
			DateTime lot22;
			if (!DateTime.TryParse(detailModel.Lot1, out lot12))
			{
			throw new Exception("非贴标物料生产日期转换失败");
			}
			if (!DateTime.TryParse(detailModel.Lot2, out lot22))
			{
			throw new Exception("非贴标物料过期日期转换失败");
			}
			lot1 = lot12.ToString();
			lot2 = lot22.ToString();
			}
			if (string.IsNullOrWhiteSpace(detailModel.PackagNo))
			{
			throw new Exception("包装不能为空");
			}
			// 计算出总金额
			detailModel.Money = detailModel.Price * detailModel.Qty;
			BllArrivalNoticeDetail detail = new BllArrivalNoticeDetail()
			@@ -375,7 +433,7 @@
			SkuNo = detailModel.SkuNo,
			SkuName = detailModel.SkuName,
			Standard = detailModel.Standard,
			LotNo = detailModel.LotNo.Trim(),
			LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim(),
			LotText = detailModel.LotText,
			Qty = (decimal)detailModel.Qty,
			PackagNo = detailModel.PackagNo,
			@@ -389,6 +447,9 @@
			Status = "0",
			IsSampling = "0",
			InspectStatus = "0",
			Lot1 = lot1, //生产日期
			Lot2 = lot2, // 过期日期
			BoxCodeStr = detailModel.BoxCodeStr,
			UDF1 = detailModel.UDF1,
			UDF2 = detailModel.UDF2,
			UDF3 = detailModel.UDF3,
			@@ -446,12 +507,12 @@
			lock (AsnLock)
			{
			//判断是否为采购入库单据或车间余料退回入库
			// 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库
			// 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库 8 生产退料入库
			//0、2、3、4 批次不能为空
			//1、添加必须为空、编辑不可为空，不能更改
			//5、6 批次可为空可不为空
			//7 必须为空
			var TypeLot = "1, 5, 6, 7"; //批次为生成批次单据类型
			var TypeLot = " 5, 6, 7"; //批次为生成批次单据类型

			var asnInfo = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == model.ASNNo && m.IsDel == "0");
			if (asnInfo == null)
			@@ -514,13 +575,13 @@
			return strMessage;
			}

			if (model.Type == "0" \|\| model.Type == "2" \|\| model.Type == "3" \|\| model.Type == "4")
			{
			if (string.IsNullOrWhiteSpace(detailModel.LotNo))
			{
			throw new Exception("当前单据类型批次不可为空!");
			}
			}
			//if (model.Type == "0" \|\| model.Type == "2" \|\| model.Type == "3" \|\| model.Type == "4")
			//{
			// if (string.IsNullOrWhiteSpace(detailModel.LotNo))
			// {
			// throw new Exception("当前单据类型批次不可为空!");
			// }
			//}

			if (TypeLot.Contains(model.Type))
			{
			@@ -550,38 +611,48 @@
			//生成自有批次
			if (detailModel.Id == 0 \|\| detailModel.Id == null \|\| string.IsNullOrWhiteSpace(detailModel.LotNo))
			{
			var notice = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && TypeLot.Contains(m.Type)).Select(m => m.ASNNo).ToList();
			if (string.IsNullOrWhiteSpace(maxLotNo))
			//var notice = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && TypeLot.Contains(m.Type)).Select(m => m.ASNNo).ToList();
			//if (string.IsNullOrWhiteSpace(maxLotNo))
			//{
			// maxLotNo = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.LotNo) && notice.Contains(m.ASNNo)).Max(m => m.LotNo);
			//}
			//if (string.IsNullOrWhiteSpace(maxLotNo))
			//{
			// maxLotNo = toDayTime.Substring(2, 6) + "0001";
			//}
			//else
			//{
			// var lotStr = maxLotNo.Substring(0, 6);
			// var timeStr = toDayTime.Substring(2, 6);
			// if (lotStr == timeStr)
			// {
			// maxLotNo = toDayTime.Substring(2, 6) + (int.Parse(maxLotNo.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
			// }
			// else
			// {
			// maxLotNo = timeStr + "0001";
			// }
			//}
			//detailModel.LotNo = maxLotNo;
			var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
			if (string.IsNullOrWhiteSpace(maxBoxCodeStr))
			{
			maxLotNo = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.LotNo) && notice.Contains(m.ASNNo)).Max(m => m.LotNo);
			}
			if (string.IsNullOrWhiteSpace(maxLotNo))
			{
			maxLotNo = toDayTime.Substring(2, 6) + "0001";
			maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
			}
			else
			{
			var lotStr = maxLotNo.Substring(0, 6);
			var timeStr = toDayTime.Substring(2, 6);
			if (lotStr == timeStr)
			{
			maxLotNo = toDayTime.Substring(2, 6) + (int.Parse(maxLotNo.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
			}
			else
			{
			maxLotNo = timeStr + "0001";
			}
			maxBoxCodeStr = "BK" + (int.Parse(maxBoxCodeStr.Replace("BK", "")) + 1).ToString();
			}
			detailModel.LotNo = maxLotNo;
			detailModel.BoxCodeStr = maxBoxCodeStr;
			}

			if (detailModel.Id == 0 \|\| detailModel.Id == null)
			{
			if (model.Type == "1")
			{
			strMessage = "-1:采购入库不可更改明细，只可编辑数量;";
			return strMessage;
			}
			//if (model.Type == "1")
			//{
			// strMessage = "-1:采购入库不可更改明细，只可编辑数量;";
			// return strMessage;
			//}
			// 计算出总金额
			detailModel.Money = detailModel.Price * detailModel.Qty;

			@@ -591,7 +662,7 @@
			SkuNo = detailModel.SkuNo,
			SkuName = detailModel.SkuName,
			Standard = detailModel.Standard,
			LotNo = detailModel.LotNo.Trim(),
			LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim(),
			LotText = detailModel.LotText,
			Qty = (decimal)detailModel.Qty,
			PackagNo = detailModel.PackagNo,
			@@ -603,8 +674,11 @@
			IsBelt = detailModel.IsBelt,
			SupplierLot = detailModel.SupplierLot,
			Status = "0",
			IsSampling = "0",
			InspectStatus = "0",
			Lot1 = detailModel.Lot1,
			Lot2 = detailModel.Lot2,
			BoxCodeStr = detailModel.BoxCodeStr,
			UDF1 = detailModel.UDF1,
			UDF2 = detailModel.UDF2,
			UDF3 = detailModel.UDF3,
			@@ -654,7 +728,7 @@
			detailModel.Money = detailModel.Price * detailModel.Qty;

			dbDetail.Qty = (decimal)detailModel.Qty;
			dbDetail.LotNo = detailModel.LotNo;
			dbDetail.LotNo = detailModel.LotNo == null ? "" : detailModel.LotNo.Trim();
			dbDetail.Money = detailModel.Money;
			dbDetail.LotText = detailModel.LotText;
			dbDetail.SupplierLot = detailModel.SupplierLot;
			@@ -787,7 +861,7 @@
			return "-1:入库单状态已变更，不可删除!";

			}
			if (asnModel.Origin != "录入" && asnModel.Origin != "采购单")
			if (asnModel.Origin != "录入" )//&& asnModel.Origin != "采购单"
			{
			return "-1:上游系统下发的单据，不可删除;";

			@@ -818,10 +892,17 @@
			asnDetail.UpdateTime = editDateTime;
			asnDetail.UpdateUser = model.CreateUser;

			//生成的标签
			var boxList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == asnDetail.Id && m.Origin == "WMS生成").ToList();

			Db.Ado.BeginTran();
			int rowCount = Db.Updateable(asnModel).ExecuteCommand();
			rowCount += Db.Updateable(asnDetail).ExecuteCommand();

			if (boxList.Count>0)
			{
			rowCount += Db.Deleteable(boxList).ExecuteCommand();
			}

			if (rowCount < 2)
			{
			Db.RollbackTran();