From 5e2454c2a75cb70afc0d1933e5c29e02e21231e6 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 八月 2024 17:01:31 +0800
Subject: [PATCH] 测试流程，修改问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 99 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 19 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 6fc3978..723c6e5 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -112,7 +112,7 @@
sqlString += "LEFT JOIN SysMaterials AS tb5 on tb1.SkuNo = tb5.SkuNo ";
sqlString += "LEFT JOIN SysUnit AS tb6 on tb5.UnitNo = tb6.UnitNo ";
sqlString += "LEFT JOIN SysPackag AS tb7 on tb1.PackagNo = tb7.PackagNo ";
- sqlString += $"WHERE tb1.ASNNo = '{model.ASNNo}' AND tb1.IsDel = '0' order by tb1.SkuNo desc ";
+ sqlString += $"WHERE tb1.ASNNo = '{model.ASNNo}' AND tb1.IsDel = '0' AND tb5.IsDel = '0' order by tb1.SkuNo desc ";
sqlString += $"offset {((model.Page - 1) * model.Limit)} rows fetch next {rowCount} rows only;";
var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
@@ -153,31 +153,58 @@
try
{
string skuType = string.Empty;
+ int IsPack = 0; //0锛氫笉绠� 1锛氳创 2锛氫笉璐�
+ /**
+ * 鎴愬搧璐� 0
+ * 閲囪喘鍙创鍙笉璐� 1
+ * 涓棿鍝佷笉璐� 2
+ * 閫�璐ц创 3
+ * 浣欐枡閫�鍥炲彲璐村彲涓嶈创 4
+ * 鍏跺畠鍙创鍙笉璐� 5
+ * 浠ｅ偍涓嶈创 6
+ * 瀵勫瓨涓嶈创 7
+ */
switch (model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
case "0"://鎴愬搧鍏ュ簱
- case "3"://閫�璐у叆搴�
- case "5"://鍏跺畠鍏ュ簱
- case "6"://浠ｅ偍鍏ュ簱
skuType = "(2)";
+ IsPack = 1; //璐�
break;
case "1"://閲囪喘鍏ュ簱
- case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
skuType = "(0,1,3)";
break;
case "2"://涓棿鍝佸叆搴�
skuType = "(4)";
+ IsPack = 2; //涓嶈创
+ break;
+ case "3"://閫�璐у叆搴�
+ skuType = "(2)";
+ IsPack = 1; //璐�
+ break;
+ case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
+ skuType = "(0,1,3)";
+ break;
+ case "5"://鍏跺畠鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
+ case "6"://浠ｅ偍鍏ュ簱
+ skuType = "(2)";
+ IsPack = 2; //涓嶈创
break;
case "7"://瀵勫瓨鍏ュ簱
- skuType = "(0,1,2,3,4)";
+ //skuType = "(3)";
+ IsPack = 2; //涓嶈创
break;
default: //鍏跺畠
- skuType = "(0,1,2,3,4)";
+ //skuType = "(0,1,2,3,4)";
break;
}
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
- .AndIF(true, it => skuType.Contains(it.Type))
+ .AndIF(model.Type != "7", it => skuType.Contains(it.Type))
+ .AndIF(model.Type == "7", it => it.SkuNo == "100088")
+ .AndIF(IsPack == 1, it => it.PackagNo != "")
+ .AndIF(IsPack == 2, it => it.PackagNo == "")
.AndIF(true, it => it.IsDel == "0")
.And(it => it.SkuNo != "100099")
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo),
@@ -192,6 +219,8 @@
.Includes(x => x.UnitInfo)
.Includes(x => x.PackagInfo)
.ToList();
+
+
return data.Select(m => new MaterialsDto()
{
@@ -230,7 +259,7 @@
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- var TypeLot = "1, 2, 5, 6, 7";
+ var TypeLot = "1, 2, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
try
{
@@ -353,8 +382,10 @@
{
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ int isType = 0;
if (model.Type == "1" || model.Type == "4")
{
+ isType = 1;
if (!string.IsNullOrWhiteSpace(model.LotNo))
{
strMessage = "-1:閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫;";
@@ -415,7 +446,7 @@
strMessage = "-1:鏁伴噺蹇呴』澶т簬0;";
continue;
}
- if (string.IsNullOrEmpty(detailModel.LotNo))
+ if (string.IsNullOrEmpty(detailModel.LotNo) && isType != 1)
{
strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
continue;
@@ -533,6 +564,7 @@
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ int notdel = 0;
if (model.Type == "1" || model.Type == "4")
{
//鑾峰彇鍗曟嵁鐢熸垚瀵瑰簲鏍囩
@@ -548,10 +580,11 @@
sqlString += $"UPDATE BllBoxInfo SET IsDel = '1',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
+ notdel = 1;
}
Db.Ado.BeginTran();
int rowCount = Db.Ado.ExecuteCommand(sqlString);
- if (rowCount < 3)
+ if (rowCount < 2 + notdel)
{
Db.RollbackTran();
return "-1:鍒犻櫎澶辫触锛�";
@@ -639,6 +672,11 @@
//{
// throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︿负鎵ц瀹屾垚");
//}
+ var palletBind = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo && m.Status != "2").ToList();
+ if (palletBind != null && palletBind.Count > 0)
+ {
+ throw new Exception("瀛樺湪鏈叆搴撳畬鎴愭墭鐩樹俊鎭紝涓嶅厑璁稿叧鍗�");
+ }
var sqlString = "";
@@ -735,16 +773,35 @@
}
var info = boxInfo.First(m => m.BindNo == item.Id);
- if (!msgS.Contains(info.SkuNo))
+ //鑾峰彇鎵樼洏缁戝畾瀵瑰簲鍗曟嵁
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(a => a.IsDel == "0" && a.Id == item.ASNDetailNo);
+ if (info != null)
{
- msgS += info.SkuNo + ";";
+ if (!msgS.Contains(info.SkuNo))
+ {
+ msgS += info.SkuNo + ";";
+ }
+
+ if (!msgL.Contains(info.LotNo))
+ {
+ msgL += info.LotNo + ";";
+
+ }
+ }
+ else
+ {
+ if (!msgS.Contains(noticeDetail.SkuNo))
+ {
+ msgS += noticeDetail.SkuNo + ";";
+ }
+
+ if (!msgL.Contains(noticeDetail.LotNo))
+ {
+ msgL += noticeDetail.LotNo + ";";
+
+ }
}
- if (!msgL.Contains(info.LotNo))
- {
- msgL += info.LotNo + ";";
-
- }
}
var time = DateTime.Now;
var log = new BllAuditLog()
@@ -852,7 +909,7 @@
{
ASNNo = asnNo,
Type = model.AsnType,
- Origin = model.Origin,
+ Origin = string.IsNullOrEmpty(model.Origin) ? "ERP" : model.Origin,
CustomerNo = model.Customer,
CustomerName = CustomerModel.CustomerName,
OrderCode = model.OrderCode,
@@ -936,6 +993,10 @@
{
throw new Exception("鏈煡璇㈠埌鍗曟嵁淇℃伅");
}
+ if (notice.Status != "3")
+ {
+ throw new Exception("澶嶆牳澶辫触锛屽崟鎹潪鍏抽棴鐘舵��");
+ }
var detail = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.ASNNo == notice.ASNNo && m.IsDel == "0").ToList();
if (detail.Count == 0)
{
--
Gitblit v1.8.0