From ca85b37c350515c99a356b6bf16023183fcc280c Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 13:49:59 +0800
Subject: [PATCH] 增加删除入库单据时删除对应标签信息。修改托盘绑定 选择入库单 加载的入库明细下拉 数据有问题。入库单据 添加入库单 选择物料 包装名称显示错误。采购入库单 删除后 此单据的物料标签也需删除避免厂商数据沉余
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 5045811..115195f 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -136,8 +136,8 @@
throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟槑缁�");
}
- var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m=>m.Qty);
- var qty = detail.Qty-labelQty;
+ var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
+ var qty = detail.Qty - labelQty;
return qty.ToString();
}
@@ -501,6 +501,7 @@
}
+
// 鍒犻櫎鎬诲崟
sqlString = $"UPDATE BllArrivalNotice SET IsDel = '1',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
@@ -510,10 +511,28 @@
sqlString += $"UPDATE BllArrivalNoticeDetail SET IsDel = '1',";
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
+
+ //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹�
+ // 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ if (model.Type == "1")
+ {
+ //鑾峰彇鍗曟嵁鐢熸垚瀵瑰簲鏍囩
+ var list = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.Status == "0" && a.BindNo == null);
+
+ //楠岃瘉瀵瑰簲绠辨敮淇℃伅鏄惁瀛樺湪
+ if (list == null)
+ {
+ return "-1:宸叉湁绠辩爜宸茬粦瀹氭墭鐩樻垨宸插叆搴擄紝涓嶅彲鍒犻櫎!";
+ }
+
+ // 鍒犻櫎瀵瑰簲绠辨敮淇℃伅
+ sqlString += $"UPDATE BllBoxInfo SET IsDel = '1',";
+ sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
+ sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
+ }
Db.Ado.BeginTran();
int rowCount = Db.Ado.ExecuteCommand(sqlString);
-
- if (rowCount < 2)
+ if (rowCount < 3)
{
Db.RollbackTran();
return "-1:鍒犻櫎澶辫触锛�";
@@ -524,6 +543,7 @@
}
catch (Exception ex)
{
+ Db.RollbackTran();
throw ex;
}
}
--
Gitblit v1.8.0