From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求
---
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 4736f19..650d65e 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -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,
@@ -522,6 +529,7 @@
data.Standard = asnDetail.Standard;
data.SupplierLot = asnDetail.SupplierLot;
data.PackageStandard = str;
+ data.SupplierLot = asnDetail.SupplierLot;
return data;
}
catch (Exception e)
@@ -572,10 +580,10 @@
{
throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏淇℃伅");
}
- if (asnList.LotNo.Length != 10 && asnList.LotNo.Length != 11 && asnList.LotNo.Length != 12)
- {
- 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)
{
@@ -1087,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
@@ -1107,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;
@@ -1120,6 +1133,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1162,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;
@@ -1175,6 +1192,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1214,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;
@@ -1227,6 +1248,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1266,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;
@@ -1279,6 +1304,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 绠卞彿
@@ -1330,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;
@@ -1344,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);
@@ -1363,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);
@@ -1398,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;
@@ -1410,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);
@@ -1420,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;
@@ -1432,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);
@@ -1466,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;
@@ -1478,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);
@@ -1490,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;
@@ -1502,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);
@@ -1558,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;
@@ -1570,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);
@@ -1586,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;
@@ -1598,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);
@@ -1630,6 +1684,8 @@
}
#endregion
+
+
return printModelList;
}
--
Gitblit v1.8.0