From 88604ff346c6dc6caf07612aa99a688d3f0428c1 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 07 三月 2025 09:37:25 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 86fe9e7..b76bf71 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -58,7 +58,7 @@
{
sqlPub += $"AND tb1.Status = '{model.Status}' ";
}
- if (!string.IsNullOrEmpty(model.Type))
+ /*if (!string.IsNullOrEmpty(model.Type))
{
if (model.Type == "3")
{
@@ -73,7 +73,7 @@
{
sqlPub += " AND tb1.Type != '3'";
- }
+ }*/
if (!string.IsNullOrEmpty(model.StartTime))
{
sqlPub += $"AND tb1.CreateTime >= '{model.StartTime}' ";
@@ -277,7 +277,7 @@
string sqlString = string.Empty;
string sqlDetailStr = string.Empty;
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- var TypeLot = "1, 5, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
+ var TypeLot = "1, 6, 7"; //鎵规鍙负绌哄崟鎹被鍨�
try
{
@@ -325,7 +325,7 @@
}
//鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- if (model.Type == "1" || model.Type == "5" || model.Type == "6" || model.Type == "7")
+ if (model.Type == "6" || model.Type == "7")//model.Type == "1" ||
{
if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
{
@@ -357,7 +357,7 @@
detailModel.LotNo = maxLotNo;
}
}
- if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
+ if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4" || model.Type == "5")
{
if (string.IsNullOrWhiteSpace(detailModel.LotNo))
{
--
Gitblit v1.8.0