JC24WMS.git - Gitblit

			@@ -15,6 +15,10 @@
			using WMS.Entity.Context;
			using WMS.Entity.SysEntity;
			using WMS.IBLL.IBllAsnServer;
			using ZXing;
			using Model.ModelDto.BllCheckDto;
			using WMS.Entity.BllCheckEntity;
			using System.Data.SqlTypes;

			namespace WMS.BLL.BllAsnServer
			{
			@@ -264,7 +268,7 @@
			.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
			.AndIF(!string.IsNullOrWhiteSpace(model.InspectMark), it => it.InspectMark == model.InspectMark.Trim())
			.AndIF(!string.IsNullOrWhiteSpace(model.BitBoxMark), it => it.BitBoxMark == model.BitBoxMark.Trim())
			.AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => it.Origin == model.Origin.Trim())
			.AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => model.Origin.Trim().Contains(it.Origin))
			.And(m => m.SkuNo != "100099" && m.IsDel == "0" && m.Status == "0")
			.ToExpression();//注意这一句不能少
			var total = 0;
			@@ -296,6 +300,7 @@
			CreateTime = a.CreateTime,
			UpdateTime = a.UpdateTime
			})
			.OrderByDescending(a=>a.BoxNo)
			.OrderByDescending(a => a.CreateTime)
			.ToOffsetPage(model.Page, model.Limit, ref total);
			count = total;
			@@ -422,7 +427,9 @@
			var data = GetAllWhereAsync(item)
			.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
			.LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
			.Select((a, b, c) => new BoxInfoDto()
			.LeftJoin<SysMaterials>((a, b, c,d) => a.SkuNo == d.SkuNo)
			.LeftJoin<SysUnit>((a, b, c, d,e) => d.UnitNo == e.UnitNo)
			.Select((a, b, c,d,e) => new BoxInfoDto()
			{
			Id = a.Id,
			ASNNo = a.ASNNo,
			@@ -440,6 +447,8 @@

			LotNo = a.LotNo,
			LotText = a.LotText,

			unit = e.UnitName,

			Status = a.Status,
			SupplierLot = a.SupplierLot,
			@@ -463,7 +472,7 @@
			CreateTime = a.CreateTime,
			UpdateTime = a.UpdateTime

			}).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
			}).OrderBy(a => a.BoxNo).OrderByDescending(a => a.CreateTime).ToOffsetPage(model.Page, model.Limit, ref total);
			count = total;
			return data;
			}
			@@ -520,6 +529,7 @@
			data.Standard = asnDetail.Standard;
			data.SupplierLot = asnDetail.SupplierLot;
			data.PackageStandard = str;
			data.SupplierLot = asnDetail.SupplierLot;
			return data;
			}
			catch (Exception e)
			@@ -529,18 +539,51 @@
			}

			//获取标签信息(生成标签)
			public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
			public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
			{
			try
			{
			{

			#region 单据、物料、包装、标签信息获取

			if (string.IsNullOrWhiteSpace(productionTime))
			{
			throw new Exception("生产日期不能为空");
			}
			if (!string.IsNullOrWhiteSpace(expirationTime) && !string.IsNullOrWhiteSpace(storeTime))
			{
			throw new Exception("有效期和储存期不能同时填写");
			}
			if (isReset != "0")
			{
			throw new Exception("不可重置批次");
			}
			DateTime proTime;
			DateTime expTime;
			DateTime stoTime;
			var bl1= DateTime.TryParse(productionTime, out proTime);
			var bl2= DateTime.TryParse(expirationTime, out expTime);
			var bl3= DateTime.TryParse(storeTime, out stoTime);
			if (!bl1)
			{
			throw new Exception("生产日期转换失败");
			}
			if (!bl2 && !string.IsNullOrWhiteSpace(expirationTime))
			{
			throw new Exception("有效期转换失败");
			}
			if (!bl3 && !string.IsNullOrWhiteSpace(storeTime))
			{
			throw new Exception("储存期转换失败");
			}
			var asnList = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.Id == imId && m.IsDel == "0");
			if (asnList == null)
			{
			throw new Exception("未查询到单据明细信息");
			}
			//if (asnList.LotNo.Length != 10 && asnList.LotNo.Length != 11 && asnList.LotNo.Length != 12)
			//{
			// throw new Exception("单据进厂编号位数长度错误");
			//}
			var asn = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == asnList.ASNNo && m.IsDel == "0");
			if (asn == null)
			{
			@@ -605,7 +648,7 @@
			zNum = Convert.ToInt32(pack.L1Num);
			}

			if (packLevel <= 1)//包装等级小于1，按照1级标签打印
			if (packLevel < 1)//包装等级小于1，按照1级标签打印
			{
			throw new Exception("包装信息有误，小于一级");
			}
			@@ -614,9 +657,9 @@
			var modelList = new List<BllBoxInfo>();

			var addLotNo = "";
			if (arriveQty < 0)
			if (arriveQty <= 0)
			{
			throw new Exception("到货数量不能小于0!");
			throw new Exception("到货数量不能小于等于0!");
			}
			Db.BeginTran();
			if (packLevel == 1)
			@@ -676,23 +719,24 @@
			}
			else
			{
			var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
			if (labelCount.Count <= 0)
			{
			throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
			}
			maxLotNoStr = label.Max(a => a.LotNo);
			maxBoxCode = label.Max(a => a.BoxNo);
			if (string.IsNullOrWhiteSpace(maxLotNoStr))
			{
			maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
			}
			//var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
			//if (labelCount.Count <= 0)
			//{
			// throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
			//}
			//maxLotNoStr = labelCount.Max(a => a.LotNo);
			maxLotNoStr = asnList.LotNo;
			//if (string.IsNullOrWhiteSpace(maxLotNoStr))
			//{
			// maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
			//}
			maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
			}

			}
			else
			{
			var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS生成").Max(a => a.LotNo); // 获取今天最大批次号
			var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS生成").Max(a => a.LotNo); // 获取今天最大批次号 20241013
			if (string.IsNullOrWhiteSpace(maxCode))
			{
			maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
			@@ -703,7 +747,7 @@
			var timeStr = toDayTime.Substring(2, 6);
			if (lotStr == timeStr)
			{
			maxLotNoStr = toDayTime.Substring(2, 6) + (int.Parse(maxCode.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
			maxLotNoStr = toDayTime.Substring(2, 6) + (int.Parse(maxCode.Substring(maxCode.Length - 4, 4)) + 1).ToString().PadLeft(4, '0');
			}
			else
			{
			@@ -747,7 +791,7 @@
			}
			else
			{
			maxBoxCode = maxBoxCode.Substring(0, 11) + (int.Parse(maxBoxCode.Substring(11, 6)) + 1).ToString().PadLeft(6, '0');
			maxBoxCode = maxBoxCode.Substring(0, maxBoxCode.Length - 6) + (int.Parse(maxBoxCode.Substring(maxBoxCode.Length - 6, 6)) + 1).ToString().PadLeft(6, '0');
			}

			// 将条码保存到原料条码表
			@@ -756,7 +800,7 @@
			ASNNo = asnList.ASNNo,
			ASNDetailNo = asnList.Id,
			BoxNo = maxBoxCode,
			Qty = int.Parse(boxQty.ToString()),
			Qty = boxQty,
			FullQty = bNum,
			Status = "0",
			SkuNo = asnList.SkuNo,
			@@ -764,20 +808,25 @@
			LotNo = maxLotNoStr,
			Standard = asnList.Standard,
			PackageStandard = packStr,
			SupplierLot = asnList.SupplierLot,
			SupplierLot = supplierLot,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1":"0",
			InspectStatus = "",
			InspectStatus = "0",

			ProductionTime = DateTime.Parse(productionTime),
			StoreTime = DateTime.Parse(storeTime),
			ExpirationTime = DateTime.Parse(expirationTime),

			ProductionTime = proTime,

			Origin = "WMS生成",
			CreateUser = userId,
			CreateTime = DateTime.Now,
			};

			if (bl2)
			{
			labelModel.ExpirationTime = expTime;
			}
			if (bl3)
			{
			labelModel.StoreTime = stoTime;
			}
			Db.Insertable(labelModel).ExecuteCommand();
			modelList.Add(labelModel);
			}
			@@ -841,18 +890,20 @@
			}
			else
			{
			var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
			if (labelCount.Count <= 0)
			{
			throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
			}
			maxCodestr2 = label.Max(a => a.LotNo); ;
			maxboxcode2 = label.Max(a => a.BoxNo);//箱号;
			maxboxcode3 = label.Max(a => a.BoxNo3);//支号;
			if (string.IsNullOrWhiteSpace(maxCodestr2))
			{
			maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
			}
			//var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
			//if (labelCount.Count <= 0)
			//{
			// throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
			//}
			//maxCodestr2 = labelCount.Max(a => a.LotNo); ;
			maxCodestr2 = asnList.LotNo;

			//if (string.IsNullOrWhiteSpace(maxCodestr2))
			//{
			// maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
			//}
			maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);//箱号;
			maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//支号;
			}

			}
			@@ -913,7 +964,7 @@
			}
			else
			{
			maxboxcode2 = maxboxcode2.Substring(0, 11) + (int.Parse(maxboxcode2.Substring(11, 6)) + 1).ToString().PadLeft(6, '0');
			maxboxcode2 = maxboxcode2.Substring(0, maxboxcode2.Length - 6) + (int.Parse(maxboxcode2.Substring(maxboxcode2.Length-6, 6)) + 1).ToString().PadLeft(6, '0');
			}
			//获取箱内支标签数量
			if (i == labelNum2)
			@@ -957,11 +1008,11 @@
			}
			else
			{
			maxboxcode3 = maxboxcode3.Substring(0, 11) + (int.Parse(maxboxcode3.Substring(11, 4)) + 1).ToString().PadLeft(4, '0');
			maxboxcode3 = maxboxcode3.Substring(0, maxboxcode3.Length - 4) + (int.Parse(maxboxcode3.Substring(maxboxcode3.Length - 4, 4)) + 1).ToString().PadLeft(4, '0');
			}

			var ssss = d.ToString("0");
			var sss = int.Parse(ssss);
			//var ssss = d.ToString("0");
			//var sss = int.Parse(ssss);

			// 将条码保存到原料条码表
			var labelModel = new BllBoxInfo()
			@@ -970,7 +1021,7 @@
			ASNDetailNo = asnList.Id,
			BoxNo = maxboxcode2,
			BoxNo3 = maxboxcode3,
			Qty = sss,
			Qty = d,
			FullQty = bNum,
			Status = "0",
			SkuNo = asnList.SkuNo,
			@@ -978,20 +1029,25 @@
			LotNo = maxCodestr2,
			Standard = asnList.Standard,
			PackageStandard = packStr,
			SupplierLot = asnList.SupplierLot,
			SupplierLot = supplierLot,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1" : "0",
			InspectStatus = "0",

			ProductionTime = DateTime.Parse(productionTime),
			StoreTime = DateTime.Parse(storeTime),
			ExpirationTime = DateTime.Parse(expirationTime),

			ProductionTime = proTime,

			Origin = "WMS生成",
			CreateUser = userId,
			CreateTime = DateTime.Now,
			};

			if (bl2)
			{
			labelModel.ExpirationTime = expTime;
			}
			if (bl3)
			{
			labelModel.StoreTime = stoTime;
			}
			Db.Insertable(labelModel).ExecuteCommand();
			modelList.Add(labelModel);
			}
			@@ -1039,6 +1095,8 @@
			//List<WmsLabelPrintLog> printlog = new List<WmsLabelPrintLog>();
			//标签表数据信息
			var list = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Origin == "WMS生成").ToList();



			#region MyRegion

			@@ -1059,6 +1117,9 @@
			{
			throw new Exception($"未查询到{boxNo}信息");
			}
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault() ;
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = data.SkuNo;
			@@ -1072,6 +1133,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

			model.Qty = dataList.Sum(m=>m.Qty);// 数量
			model.unit = unitname.unit;

			model.BoxNo = data.BoxNo; // 箱号

			@@ -1114,6 +1176,9 @@
			{
			throw new Exception($"未查询到{item}信息");
			}
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = data.SkuNo;
			@@ -1127,6 +1192,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

			model.Qty = data1.Sum(m => m.Qty);// 数量
			model.unit = unitname.unit;

			model.BoxNo = data.BoxNo; // 箱号

			@@ -1166,6 +1232,9 @@
			{
			throw new Exception($"未查询到{boxNo2}信息");
			}
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = data.SkuNo;
			@@ -1179,6 +1248,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

			model.Qty = data.Qty;// 数量
			model.unit = unitname.unit;

			model.BoxNo = data.BoxNo3; // 支号

			@@ -1218,6 +1288,9 @@
			var i = 0;
			foreach (var data in data2)
			{
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = data.SkuNo;
			@@ -1231,6 +1304,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

			model.Qty = data.Qty;// 数量
			model.unit = unitname.unit;

			model.BoxNo = data.BoxNo3; // 箱号

			@@ -1282,8 +1356,10 @@
			{
			throw new Exception($"当前支码不是箱码内");
			}


			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值箱码
			BoxInfoDto model1 = new BoxInfoDto();
			model1.SkuNo = data.SkuNo;
			@@ -1296,6 +1372,7 @@
			model1.ExpirationTime = data.ExpirationTime; // 有效期至
			model1.StoreTime = data.StoreTime; // 储存期至
			model1.Qty = dataList.Sum(m=>m.Qty);// 数量
			model1.unit = unitname.unit;
			model1.BoxNo = data.BoxNo; // 箱号

			model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
			@@ -1315,6 +1392,7 @@
			model.ExpirationTime = data.ExpirationTime; // 有效期至
			model.StoreTime = data.StoreTime; // 储存期至
			model.Qty = data.Qty;// 数量
			model.unit = unitname.unit;
			model.BoxNo = data.BoxNo3; // 支号

			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
			@@ -1350,6 +1428,9 @@

			var data = list.Where(m => m.BoxNo == boxNo);
			var boxData = data2.FirstOrDefault();
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = boxData.SkuNo;
			@@ -1362,6 +1443,7 @@
			model.ExpirationTime = boxData.ExpirationTime; // 有效期至
			model.StoreTime = boxData.StoreTime; // 储存期至
			model.Qty = data.Sum(m => m.Qty); // 数量
			model.unit = unitname.unit;
			model.BoxNo = boxData.BoxNo; // 支号

			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
			@@ -1372,6 +1454,9 @@
			var i = 0;
			foreach (var item in data2)
			{
			//单位
			sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
			unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model1 = new BoxInfoDto();
			model1.SkuNo = item.SkuNo;
			@@ -1384,6 +1469,7 @@
			model1.ExpirationTime = item.ExpirationTime; // 有效期至
			model1.StoreTime = item.StoreTime; // 储存期至
			model1.Qty = item.Qty;// 数量
			model1.unit = unitname.unit;
			model1.BoxNo = item.BoxNo3; // 支号

			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
			@@ -1418,6 +1504,9 @@
			{
			throw new Exception($"未查询到{boxNo}箱码信息");
			}
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = boxData.SkuNo;
			@@ -1430,6 +1519,7 @@
			model.ExpirationTime = boxData.ExpirationTime; // 有效期至
			model.StoreTime = boxData.StoreTime; // 储存期至
			model.Qty = data.Sum(m => m.Qty); // 数量
			model.unit = unitname.unit;
			model.BoxNo = boxData.BoxNo; // 支号

			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
			@@ -1442,6 +1532,9 @@
			var i = 0;
			foreach (var item in data)
			{
			//单位
			sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
			unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model1 = new BoxInfoDto();
			model1.SkuNo = item.SkuNo;
			@@ -1454,6 +1547,7 @@
			model1.ExpirationTime = item.ExpirationTime; // 有效期至
			model1.StoreTime = item.StoreTime; // 储存期至
			model1.Qty = item.Qty; // 数量
			model1.unit = unitname.unit;
			model1.BoxNo = item.BoxNo3; // 支号

			model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
			@@ -1510,6 +1604,9 @@
			{
			throw new Exception($"未查询到{demo}箱码信息");
			}
			//单位
			var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
			var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model = new BoxInfoDto();
			model.SkuNo = boxData.SkuNo;
			@@ -1522,6 +1619,7 @@
			model.ExpirationTime = boxData.ExpirationTime; // 有效期至
			model.StoreTime = boxData.StoreTime; // 储存期至
			model.Qty = data.Sum(m => m.Qty); // 数量
			model.unit = unitname.unit;
			model.BoxNo = boxData.BoxNo; // 支号

			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
			@@ -1538,6 +1636,9 @@
			{
			foreach (var item in data.OrderBy(m => m.BoxNo3).ToList())
			{
			//单位
			sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
			unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
			// 物料条码信息赋值
			BoxInfoDto model1 = new BoxInfoDto();
			model1.SkuNo = item.SkuNo;
			@@ -1550,6 +1651,7 @@
			model1.ExpirationTime = item.ExpirationTime; // 有效期至
			model1.StoreTime = item.StoreTime; // 储存期至
			model1.Qty = item.Qty;// 数量
			model1.unit = unitname.unit;
			model1.BoxNo = item.BoxNo3; // 支号

			model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
			@@ -1582,6 +1684,8 @@
			}

			#endregion



			return printModelList;
			}
			@@ -1590,5 +1694,188 @@
			throw new Exception(e.Message);
			}
			}

			//根据入库单号过去单据下所有批次号
			public List<string> GetLotNoListByAsn(string asnNo)
			{
			try
			{
			var data = new List<string>();
			var asnList = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo).ToList();
			if (asnList.Count == 0)
			{
			throw new Exception("未查询到该单据号的信息");
			}

			foreach (var item in asnList)
			{
			if (string.IsNullOrWhiteSpace(item.LotNo))
			{
			continue;
			}

			var strList = item.LotNo.Split(";");
			foreach (var str in strList)
			{
			if (string.IsNullOrWhiteSpace(str))
			{
			continue;
			}
			data.Add(str);
			}
			}

			return data;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}

			//删除单据下单个或多个批次的标签
			public void DelLabelByAsnNo(string asnNo,string lotNo, int userId)
			{
			try
			{
			var asnList = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo).ToList();
			if (asnList.Count == 0)
			{
			throw new Exception("未查询到该单据号的信息");
			}

			Db.BeginTran();

			//批次为空：当前单据下所有批次的标签全部删除；有批次：伤处当前单据下当前批次的标签
			if (string.IsNullOrWhiteSpace(lotNo)) //删除全部标签
			{
			var labelList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo).ToList();
			if (labelList.Count(m => m.Status != "0") >= 1)
			{
			throw new Exception("当前单据批次的标签已有已使用，不能删除");
			}

			//foreach (var item in asnList)
			//{
			// if (string.IsNullOrWhiteSpace(item.LotNo))
			// {
			// continue;
			// }

			// item.LotNo = "";
			// Db.Updateable(item).ExecuteCommand();

			//}
			Db.Deleteable(labelList).ExecuteCommand();
			}
			else //删除固定批次标签
			{
			var labelList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo && m.LotNo == lotNo).ToList();
			if (labelList.Count(m=>m.Status != "0") >= 1 )
			{
			throw new Exception("当前单据批次的标签已有已使用，不能删除");
			}

			//foreach (var item in asnList)
			//{
			// if (string.IsNullOrWhiteSpace(item.LotNo) \|\| item.LotNo!=lotNo)
			// {
			// continue;
			// }

			// var strList = item.LotNo.Split(";");
			// var updateLotNo = "";
			// foreach (var str in strList)
			// {
			// if (string.IsNullOrWhiteSpace(str) \|\| str == lotNo)
			// {
			// continue;
			// }

			// if (string.IsNullOrWhiteSpace(updateLotNo))
			// {
			// updateLotNo = str;
			// }
			// else
			// {
			// updateLotNo += ";" + str;
			// }

			// }

			// item.LotNo = updateLotNo;
			// Db.Updateable(item).ExecuteCommand();

			//}
			Db.Deleteable(labelList).ExecuteCommand();
			}

			Db.CommitTran();

			var msg = $"删除了单据号：{asnNo}";
			if (!string.IsNullOrWhiteSpace(lotNo))
			{
			msg += $"、批次号：{lotNo}";
			}
			msg += "的标签信息";

			new OperationASNServer().AddLogOperationAsn("入库作业", "物料标签", asnNo, "删除", msg, userId);
			}
			catch (Exception e)
			{
			Db.RollbackTran();
			throw new Exception(e.Message);
			}
			}


			//编辑标签数量
			public void EditLabelQty(int id, string qty, int userId)
			{
			try
			{
			if (string.IsNullOrWhiteSpace(qty))
			{
			throw new Exception("编辑数量不可为空");
			}
			var qtyData = 0m;
			var isOk = decimal.TryParse(qty, out qtyData);
			var boxInfo = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.Id == id);
			if (boxInfo == null)
			{
			throw new Exception("未查询到该标签信息");
			}

			if (isOk)
			{
			if (qtyData <= 0)
			{
			throw new Exception("数量不能小于等于0");
			}
			boxInfo.Qty = qtyData;

			Db.Updateable(boxInfo).ExecuteCommand();
			}
			else
			{
			throw new Exception("数量转换失败");
			}

			var msg = $"编辑了箱号：{boxInfo.BoxNo}";
			if (!string.IsNullOrWhiteSpace(boxInfo.BoxNo3))
			{
			msg += $"、支号：{boxInfo.BoxNo3}";
			}
			msg += "的标签数量信息";

			new OperationASNServer().AddLogOperationAsn("入库作业", "物料标签", boxInfo.BoxNo, "编辑", msg, userId);
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}


			}
			}