JC24WMS.git - Gitblit

			@@ -7,6 +7,7 @@
			using System.Linq;
			using System.Linq.Expressions;
			using Model.ModelDto.BllAsnDto;
			using Model.ModelVm.BllAsnVm;
			using Utility.Tools;
			using WMS.BLL.LogServer;
			using WMS.DAL;
			@@ -399,9 +400,136 @@
			}



			//获取标签箱码信息
			public List<BoxInfoDto> GetLabelBoxList(LabelBoxInfoVm model, out int count)
			{
			try
			{
			Expression<Func<BllBoxInfo, bool>> item = Expressionable.Create<BllBoxInfo>()
			.AndIF(!string.IsNullOrWhiteSpace(model.AsnNo), it => it.ASNNo.Contains(model.AsnNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.BoxNo), it => it.BoxNo.Contains(model.BoxNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.SupplierLot), it => it.SupplierLot.Contains(model.SupplierLot.Trim()))
			.AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.SupplierLot)
			.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
			.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime <= Convert.ToDateTime(model.ProductionTime).AddDays(1))
			.And(it => it.IsDel == "0")
			.ToExpression();

			var total = 0;
			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()
			{
			Id = a.Id,
			ASNNo = a.ASNNo,
			ASNDetailNo = a.ASNDetailNo,
			BoxNo = a.BoxNo,
			BoxNo2 = a.BoxNo2,
			BoxNo3 = a.BoxNo3,
			Qty = a.Qty,
			FullQty = a.FullQty,

			SkuNo = a.SkuNo,
			SkuName = a.SkuName,
			Standard = a.Standard,
			PackageStandard = a.PackageStandard,

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

			Status = a.Status,
			SupplierLot = a.SupplierLot,

			ProductionTime = a.ProductionTime,
			ExpirationTime = a.ExpirationTime,
			StoreTime = a.StoreTime,
			CompleteTime = a.CompleteTime,

			InspectMark = a.InspectMark,
			BitBoxMark = a.BitBoxMark,
			InspectStatus = a.InspectStatus,

			Origin = a.Origin,
			QtyCount = a.QtyCount,
			QtyOrd = a.QtyOrd,


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

			}).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
			count = total;
			return data;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}

			//获取标签模板根据入库单明细ID
			public BoxInfoDto GetLabelBoxModel(int id)
			{
			try
			{
			var asnDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.Id == id && m.IsDel == "0");
			if (asnDetail == null)
			{
			throw new Exception("未查询到单据明细信息，请核实");
			}

			var packInfo = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == asnDetail.PackagNo);
			if (packInfo == null)
			{
			throw new Exception("未查询到单据明细中的物料包装信息");
			}

			var str = "";

			if (!string.IsNullOrWhiteSpace(packInfo.L1Name))
			{
			str += packInfo.L1Num + "/" + packInfo.L1Name;
			}
			if (!string.IsNullOrWhiteSpace(packInfo.L2Name))
			{
			str += "-" + packInfo.L2Num + "/" + packInfo.L2Name;
			}
			if (!string.IsNullOrWhiteSpace(packInfo.L3Name))
			{
			str += "-" + packInfo.L3Num + "/" + packInfo.L3Name;
			}
			if (!string.IsNullOrWhiteSpace(packInfo.L4Name))
			{
			str += "-" + packInfo.L4Num + "/" + packInfo.L4Name;
			}
			if (!string.IsNullOrWhiteSpace(packInfo.L5Name))
			{
			str += "-" + packInfo.L5Num + "/" + packInfo.L5Name;
			}


			var data = new BoxInfoDto();
			data.SkuNo = asnDetail.SkuNo;
			data.SkuName = asnDetail.SkuName;
			data.Standard = asnDetail.Standard;
			data.SupplierLot = asnDetail.SupplierLot;
			data.PackageStandard = str;
			return data;
			}
			catch (Exception e)
			{
			throw new Exception(e.Message);
			}
			}

			//获取标签信息(生成标签)
			public List<LabelBoxDto> AddLabelBoxReturn(int imId, string isReset, decimal arriveQty, string skuName, string standard, string packStandard, string skuNo,
			string supplierLot, string productionTime, string expirationTime, string storeTime, int userId)
			public List<BoxInfoDto> AddLabelBoxReturn(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
			{
			try
			{
			@@ -418,15 +546,37 @@
			{
			throw new Exception("未查询到单据信息");
			}
			//物料
			var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == asnList.SkuNo);

			var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == asnList.PackagNo);
			if (pack == null)
			{
			throw new Exception("未查询到当前单据中物料的包装信息");
			}

			var packStr = "";

			if (!string.IsNullOrWhiteSpace(pack.L1Name))
			{
			packStr += pack.L1Num + "/" + pack.L1Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L2Name))
			{
			packStr += "-" + pack.L2Num + "/" + pack.L2Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L3Name))
			{
			packStr += "-" + pack.L3Num + "/" + pack.L3Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L4Name))
			{
			packStr += "-" + pack.L4Num + "/" + pack.L4Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L5Name))
			{
			packStr += "-" + pack.L5Num + "/" + pack.L5Name;
			}
			//标签表
			var label = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == imId).ToList();
			var label = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == imId).ToList();


			#endregion
			@@ -487,7 +637,7 @@
			}

			#endregion

			var modelList = new List<BllBoxInfo>();
			if (packLevel == 1)
			{
			#region 一级包装
			@@ -529,7 +679,7 @@
			string maxBoxCode = ""; //箱码号
			// 生成自编批号
			string toDayTime = DateTime.Now.ToString("yyyyMMdd");
			var diJiJian = 0;


			var maxLotNo = label.Max(a => a.LotNo);
			var maxBoxNo = label.Max(a => a.BoxNo);
			@@ -568,89 +718,70 @@

			#endregion

			var modelList = new List<LabelBoxDto>();


			for (int i = 1; i <= labelNum; i++)
			{
			// 物料条码信息赋值
			LabelBoxDto model = new LabelBoxDto();
			model.AsnDetailNo = imId;
			model.SkuNo = asnList.SkuNo;
			model.SkuName = asnList.SkuName;

			model.SupplierName = asn.CustomerName; // 供应商

			model.Standard = asnList.Standard; // 规格
			model.PackageStandard = packStandard;
			model.SupplierLot = supplierLot; // 厂家批号
			model.LotNo = maxLotNoStr; //批次

			model.ProductionTime = DateTime.Parse(productionTime); // 生产日期
			model.StoreTime = DateTime.Parse(storeTime); // 储存期至
			model.ExpirationTime = DateTime.Parse(expirationTime); // 有效期至/贮存期
			decimal boxQty = 0;
			if (i == labelNum)
			{
			// 最后一个条码
			var s = zNum * (i - 1);
			if (zNum > qty - s)
			{
			model.Qty = qty - s;// 数量
			boxQty = qty - s;// 数量
			}
			else
			{
			model.Qty = zNum;// 数量
			boxQty = zNum;// 数量
			}
			}
			else
			{
			model.Qty = zNum; // 数量
			boxQty = zNum; // 数量
			}


			//获取箱码
			if (maxBoxCode == "")
			{
			var str = model.LotNo + "000001";
			model.BoxNo = str; // 支号批号+ 流水 2302010001000001
			maxBoxCode = model.BoxNo;
			var str = maxLotNoStr + "000001"; //批号+ 流水 2302010001000001
			maxBoxCode = str;
			}
			else
			{
			model.BoxNo = maxBoxCode.Substring(0, 10) + (int.Parse(maxBoxCode.Substring(10, 6)) + 1).ToString().PadLeft(6, '0');
			maxBoxCode = model.BoxNo;
			}
			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 80, 50);

			// 添加到list集合
			modelList.Add(model);

			maxBoxCode = maxBoxCode.Substring(0, 10) + (int.Parse(maxBoxCode.Substring(10, 6)) + 1).ToString().PadLeft(6, '0');
			}

			// 将条码保存到原料条码表
			var labelModel = new BllLabelBoxNo()
			var labelModel = new BllBoxInfo()
			{
			ASNNo = asnList.ASNNo,
			ASNDetailNo = asnList.Id,
			BoxNo = model.BoxNo,
			ParentBoxNo = "",
			Qty = model.Qty,
			SkuNo = model.SkuNo,
			SkuName = model.SkuName,
			Standard = model.Standard,
			PackageStandard = model.PackageStandard,
			BoxNo = maxBoxCode,
			Qty = int.Parse(boxQty.ToString()),
			FullQty = bNum,
			Status = "0",
			SkuNo = asnList.SkuNo,
			SkuName = asnList.SkuName,
			LotNo = maxLotNoStr,
			Standard = asnList.Standard,
			PackageStandard = packStr,
			SupplierLot = asnList.SupplierLot,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1":"0",
			InspectStatus = "",

			LotNo = model.LotNo,
			SupplierName = asn.CustomerName,
			ProductionTime = model.ProductionTime,
			SupplierLot = model.SupplierLot,
			StoreTime = model.StoreTime,
			ExpirationTime = model.ExpirationTime,
			IsUse = "0",
			Level = "1",
			ProductionTime = DateTime.Parse(productionTime),
			StoreTime = DateTime.Parse(storeTime),
			ExpirationTime = DateTime.Parse(expirationTime),

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

			Db.Insertable(labelModel).ExecuteCommand();

			modelList.Add(labelModel);
			}

			#endregion
			@@ -698,8 +829,8 @@
			if (isReset == "0")
			{
			var maxCode = label.Max(a => a.LotNo);
			var boxCode1 = label.Where(m => m.Level == "1").Max(a => a.BoxNo);//箱号
			var boxCode2 = label.Where(m => m.Level == "2").Max(a => a.BoxNo);//支号
			var boxCode1 = label.Max(a => a.BoxNo);//箱号
			var boxCode2 = label.Max(a => a.BoxNo3);//支号
			maxCodestr2 = maxCode;
			maxboxcode2 = boxCode1;
			maxboxcode3 = boxCode2;
			@@ -733,59 +864,21 @@

			#endregion

			var modelList = new List<LabelBoxDto>();


			for (int i = 1; i <= labelNum2; i++)//箱码标签
			{
			// 物料条码信息赋值
			LabelBoxDto model = new LabelBoxDto();
			model.AsnDetailNo = imId;
			model.SkuNo = asnList.SkuNo;
			model.SkuName = asnList.SkuName;

			model.Standard = asnList.Standard; // 规格
			model.PackageStandard = packStandard;

			model.SupplierLot = supplierLot; // 厂家批号
			model.LotNo = maxCodestr2; //批次

			model.ProductionTime = DateTime.Parse(productionTime); // 生产日期
			model.StoreTime = DateTime.Parse(storeTime); // 储存期至
			model.ExpirationTime = DateTime.Parse(expirationTime); // 有效期至/贮存期
			if (i == labelNum2)
			{
			// 最后一个条码
			var s = bNum * (i - 1);
			if (bNum > qty2 - s)
			{
			model.Qty = qty2 - s;// 数量
			}
			else
			{
			model.Qty = bNum;// 数量
			}
			}
			else
			{
			model.Qty = bNum; // 数量
			}


			//获取箱码
			if (maxboxcode2 == "")
			{
			maxboxcode2 = model.LotNo + "000001";
			model.BoxNo = maxboxcode2; // 箱号批号+第几箱
			maxboxcode2 = model.BoxNo;
			maxboxcode2 = maxCodestr2 + "000001"; // 箱号批号+第几箱
			}
			else
			{
			model.BoxNo = maxboxcode2.Substring(0, 10) + (int.Parse(maxboxcode2.Substring(10, 6)) + 1).ToString().PadLeft(6, '0');
			maxboxcode2 = model.BoxNo;
			maxboxcode2 = maxboxcode2.Substring(0, 10) + (int.Parse(maxboxcode2.Substring(10, 6)) + 1).ToString().PadLeft(6, '0');
			}
			model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 80, 50);

			// 添加到list集合
			modelList.Add(model);

			//获取箱内支标签数量
			if (i == labelNum2)
			{
			var isGo2 = false;
			@@ -796,17 +889,6 @@
			{
			break;
			}
			var d = zNum;
			if (i == labelNum2)
			{
			var s = bNum * (i - 1);
			var s2 = zNum * (j - 1);
			if (zNum >= qty2 - s - s2)
			{
			d = (int)(qty2 - s - s2); // 数量
			isGo2 = true;
			}
			}
			sl++;
			}
			labelNumZ2 = sl;
			@@ -814,99 +896,58 @@

			for (int j = 1; j <= labelNumZ2; j++)//最小单位标签
			{
			if (isGo)
			{
			break;
			}
			var d = zNum;

			decimal d = zNum;
			if (i == labelNum2)
			{
			var s = bNum * (i - 1);
			var s2 = zNum * (j - 1);
			if (zNum >= qty2 - s - s2)
			{
			d = (int)(qty2 - s - s2); // 数量
			isGo = true;
			d = qty2 - s - s2; // 数量
			}
			}
			//// 物料条码信息赋值
			//LabelPrint5Model model2 = new LabelPrint5Model();
			//model2.ImportId = imId;
			//model2.OuterBillCode = list.OuterBillCode;
			//model2.ImportBillCode = list.ImportBillCode;
			//model2.SkuNo = list.GoodsCode;
			//model2.SkuName = list.GoodsName;
			//model2.QtyCount = (int)labelNumZ2; // 总件数(int)labelNumZ2

			if (maxboxcode3 == "")
			{
			maxboxcode3 = maxCodestr2 + "0001"; // 支号批号+第几箱
			}
			else
			{
			maxboxcode3 = maxboxcode3.Substring(0, 28) + (int.Parse(maxboxcode3.Substring(28, 4)) + 1).ToString().PadLeft(4, '0');
			}

			//model2.SupplierName = supplierName; // 生产厂家
			//model2.ProductionDate = productionDate; // 生产日期
			//model2.SapSkuNo = sapNo; // SAP代码
			//model2.Standard = good.GoodsStandard; // 规格
			//model2.SupplierLot = supplierLot; // 厂家批号
			// 将条码保存到原料条码表
			var labelModel = new BllBoxInfo()
			{
			ASNNo = asnList.ASNNo,
			ASNDetailNo = asnList.Id,
			BoxNo = maxboxcode2,
			BoxNo3 = maxboxcode3,
			Qty = int.Parse(d.ToString()),
			FullQty = bNum,
			Status = "0",
			SkuNo = asnList.SkuNo,
			SkuName = asnList.SkuName,
			LotNo = maxCodestr2,
			Standard = asnList.Standard,
			PackageStandard = packStr,
			SupplierLot = asnList.SupplierLot,
			InspectMark = "0",
			BitBoxMark = bNum > d ? "1" : "0",
			InspectStatus = "0",

			//model2.LotNo = maxCodestr2; //批次
			ProductionTime = DateTime.Parse(productionTime),
			StoreTime = DateTime.Parse(storeTime),
			ExpirationTime = DateTime.Parse(expirationTime),

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

			//model2.InspectTime = inspectTime; // 复验期至
			//model2.ExpirationTime = expirationTime; // 有效期至/贮存期
			//model2.ExpirationType = good.GoodsTemp; // 贮存条件
			//model2.Qty = d; // 数量

			//model2.QtyOrd = j; // 第几件
			//if (maxboxcode3 == "")
			//{
			// var str = mesGood.PadRight(16, ' ') + model.LotNo.PadRight(12, ' ') + "0001";
			// model2.BoxCode = str; // 支号批号+第几箱
			// maxboxcode3 = model2.BoxCode;
			//}
			//else
			//{
			// model2.BoxCode = maxboxcode3.Substring(0, 28) + (int.Parse(maxboxcode3.Substring(28, 4)) + 1).ToString().PadLeft(4, '0');
			// maxboxcode3 = model2.BoxCode;
			//}

			//model2.imageStr = Utility.Extra.BarcodeHelper.GetQrCodeBase64(model2.BoxCode, 85, 85);
			//// 添加到list集合

			//if (printModel.Count(m => m.BoxCode.Length > 17) <= 100)//排除待箱码判断支码是否小于100
			//{
			// printModel.Add(model2);
			//}
			//var guid = Guid.NewGuid().ToString("N");
			//// 将条码保存到原料条码表
			//var LabelModel2 = new LabelPrint
			//{
			// LabelID = guid,
			// LabelStream = model.BoxCode,
			// BoxCode1 = model2.BoxCode,
			// GoodsCode = model2.SkuNo,
			// GoodsName = model2.SkuName,
			// GoodsStandard = model2.Standard,
			// ImportLotNo = model2.LotNo,
			// SupplierName = model2.SupplierName,
			// ImportId = model2.ImportId,
			// OuterBillCode = model2.OuterBillCode,
			// ImportBillCode = model2.ImportBillCode,
			// ProductionDate = model2.ProductionDate,
			// SapSkuNo = model2.SapSkuNo,
			// Qty = model2.Qty,
			// SupplierLot = model2.SupplierLot,
			// InspectTime = model2.InspectTime,
			// ExpirationTime = model2.ExpirationTime,
			// QtyCount = model2.QtyCount,
			// QtyOrd = model2.QtyOrd,
			// ExpirationType = model2.ExpirationType,
			// BoxNum = bNum,//model.Qty,

			// BulkTank = model.Qty == bNum ? 0 : 1,//零头箱
			// BulkCase = 0,//零头盒

			// CreateUser = createUser,
			// CreateTime = DateTime.Now,
			// IsUse = 0
			//};

			//DataContext.LabelPrint.InsertOnSubmit(LabelModel2);
			Db.Insertable(labelModel).ExecuteCommand();
			modelList.Add(labelModel);
			}


			@@ -915,7 +956,7 @@
			#endregion
			}

			//return printModel;
			//return labelModel;


			throw new NotImplementedException();