JC24WMS.git - Gitblit

			@@ -16,6 +16,9 @@
			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
			{
			@@ -424,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,
			@@ -442,6 +447,8 @@

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

			unit = e.UnitName,

			Status = a.Status,
			SupplierLot = a.SupplierLot,
			@@ -1087,6 +1094,8 @@
			//List<WmsLabelPrintLog> printlog = new List<WmsLabelPrintLog>();
			//标签表数据信息
			var list = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Origin == "WMS生成").ToList();



			#region MyRegion

			@@ -1107,6 +1116,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;
			@@ -1120,6 +1132,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

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

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

			@@ -1162,6 +1175,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;
			@@ -1175,6 +1191,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

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

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

			@@ -1214,6 +1231,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;
			@@ -1227,6 +1247,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

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

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

			@@ -1266,6 +1287,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;
			@@ -1279,6 +1303,7 @@
			model.StoreTime = data.StoreTime; // 储存期至

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

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

			@@ -1330,8 +1355,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;
			@@ -1344,6 +1371,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);
			@@ -1363,6 +1391,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);
			@@ -1398,6 +1427,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;
			@@ -1410,6 +1442,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);
			@@ -1420,6 +1453,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;
			@@ -1432,6 +1468,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);
			@@ -1466,6 +1503,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;
			@@ -1478,6 +1518,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);
			@@ -1490,6 +1531,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;
			@@ -1502,6 +1546,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);
			@@ -1558,6 +1603,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;
			@@ -1570,6 +1618,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);
			@@ -1586,6 +1635,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;
			@@ -1598,6 +1650,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);
			@@ -1630,6 +1683,8 @@
			}

			#endregion



			return printModelList;
			}