From a339e5234e6299d32672aaae648e5315900c2633 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 21 二月 2024 16:46:36 +0800
Subject: [PATCH] 排查pda数量组托无法删除明细问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 6fc3978..9922eb2 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -156,12 +156,20 @@
switch (model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
case "0"://鎴愬搧鍏ュ簱
+ skuType = "(2)";
+ break;
case "3"://閫�璐у叆搴�
+ skuType = "(2)";
+ break;
case "5"://鍏跺畠鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
case "6"://浠ｅ偍鍏ュ簱
skuType = "(2)";
break;
case "1"://閲囪喘鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
skuType = "(0,1,3)";
break;
@@ -353,8 +361,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 +425,7 @@
strMessage = "-1:鏁伴噺蹇呴』澶т簬0;";
continue;
}
- if (string.IsNullOrEmpty(detailModel.LotNo))
+ if (string.IsNullOrEmpty(detailModel.LotNo) && isType != 1)
{
strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
continue;
@@ -533,6 +543,7 @@
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ int notdel = 0;
if (model.Type == "1" || model.Type == "4")
{
//鑾峰彇鍗曟嵁鐢熸垚瀵瑰簲鏍囩
@@ -548,10 +559,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 +651,11 @@
//{
// throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︿负鎵ц瀹屾垚");
//}
+ var palletBind = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status != "2").ToList();
+ if (palletBind != null && palletBind.Count > 0)
+ {
+ throw new Exception("瀛樺湪鏈叆搴撳畬鎴愭墭鐩樹俊鎭紝涓嶅厑璁稿叧鍗�");
+ }
var sqlString = "";
--
Gitblit v1.8.0