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 | 305 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 228 insertions(+), 77 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index fa7aa45..650d65e 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -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
{
@@ -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)
@@ -532,15 +542,48 @@
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)
{
@@ -676,24 +719,24 @@
}
else
{
- var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
- if (labelCount.Count <= 0)
- {
- throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
- }
- maxLotNoStr = labelCount.Max(a => a.LotNo);
-
- 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";
@@ -704,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
{
@@ -748,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');
}
// 灏嗘潯鐮佷繚瀛樺埌鍘熸枡鏉＄爜琛�
@@ -770,15 +813,20 @@
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);
}
@@ -842,17 +890,18 @@
}
else
{
- var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
- if (labelCount.Count <= 0)
- {
- throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
- }
- maxCodestr2 = labelCount.Max(a => a.LotNo); ;
+ //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";
- }
+ //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);//鏀彿;
}
@@ -915,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)
@@ -959,7 +1008,7 @@
}
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");
@@ -980,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);
}
@@ -1041,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
@@ -1061,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;
@@ -1074,6 +1133,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1116,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;
@@ -1129,6 +1192,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1168,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;
@@ -1181,6 +1248,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1220,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;
@@ -1233,6 +1304,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 绠卞彿
@@ -1284,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;
@@ -1298,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);
@@ -1317,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);
@@ -1352,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;
@@ -1364,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);
@@ -1374,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;
@@ -1386,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);
@@ -1420,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;
@@ -1432,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);
@@ -1444,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;
@@ -1456,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);
@@ -1512,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;
@@ -1524,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);
@@ -1540,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;
@@ -1552,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);
@@ -1584,6 +1684,8 @@
}
#endregion
+
+
return printModelList;
}
@@ -1653,17 +1755,17 @@
throw new Exception("褰撳墠鍗曟嵁鎵规鐨勬爣绛惧凡鏈夊凡浣跨敤锛屼笉鑳藉垹闄�");
}
- foreach (var item in asnList)
- {
- if (string.IsNullOrWhiteSpace(item.LotNo))
- {
- continue;
- }
+ //foreach (var item in asnList)
+ //{
+ // if (string.IsNullOrWhiteSpace(item.LotNo))
+ // {
+ // continue;
+ // }
- item.LotNo = "";
- Db.Updateable(item).ExecuteCommand();
+ // item.LotNo = "";
+ // Db.Updateable(item).ExecuteCommand();
- }
+ //}
Db.Deleteable(labelList).ExecuteCommand();
}
else //鍒犻櫎鍥哄畾鎵规鏍囩
@@ -1674,37 +1776,37 @@
throw new Exception("褰撳墠鍗曟嵁鎵规鐨勬爣绛惧凡鏈夊凡浣跨敤锛屼笉鑳藉垹闄�");
}
- foreach (var item in asnList)
- {
- if (string.IsNullOrWhiteSpace(item.LotNo) || item.LotNo!=lotNo)
- {
- continue;
- }
+ //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;
- }
+ // 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;
- }
+ // if (string.IsNullOrWhiteSpace(updateLotNo))
+ // {
+ // updateLotNo = str;
+ // }
+ // else
+ // {
+ // updateLotNo += ";" + str;
+ // }
- }
+ // }
- item.LotNo = updateLotNo;
- Db.Updateable(item).ExecuteCommand();
+ // item.LotNo = updateLotNo;
+ // Db.Updateable(item).ExecuteCommand();
- }
+ //}
Db.Deleteable(labelList).ExecuteCommand();
}
@@ -1726,5 +1828,54 @@
}
}
+
+ //缂栬緫鏍囩鏁伴噺
+ 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);
+ }
+ }
+
+
}
}
--
Gitblit v1.8.0