From f392d4cfaa17fd63662fc299dd42dab5038cba6b Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 25 七月 2025 14:17:44 +0800
Subject: [PATCH] 1，产测查询逻辑修改，2，退货申请逻辑修改
---
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 20 ++++++++++----------
StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 6c5d183..3a84ac0 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -160,7 +160,7 @@
{
Id = nextSequenceValue,
ItemOutNo = billCode,
- Status = 0,
+ Status = 1,
CreateBy = "PL017",
CreateDate = DateTime.Now,
BillTypeId = 200,
@@ -178,7 +178,7 @@
Nflag = 0,
Fmrmode = from.FMRMODE,
Sapno = from.SqNo,
- Organizeid = "1002503270000079",
+ Organizeid = "1002011210000095",
};
// 鍒涘缓閲囪喘閫�鏂欏崟璁板綍
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 602a24d..edc8bea 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -22,19 +22,19 @@
{
OracleSQLHelper SQLHelper = new();
//鏌ュ伐鍗曚俊鎭�
- //var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
- // join MES_LINE b on A.LINEID=b.ID
- // left join WOMDAA C on C.DAA015=B.LINE_NO
- // left join mes_items s on s.id = C.daa002
- // where LOGINID='" + id+ "' and DAA018='宸插紑宸�' order by DAA016 asc";
-
- //鏀逛负鎸夌珯浣嶅彿鍙嶆煡浜х嚎锛屽啀閫氳繃浜х嚎鏌ュ嚭宸ュ崟淇℃伅
- var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
- left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
+ var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
join MES_LINE b on A.LINEID=b.ID
left join WOMDAA C on C.DAA015=B.LINE_NO
left join mes_items s on s.id = C.daa002
- where WORKSNO='" + id+ "' and DAA018='宸插紑宸�' order by DAA016 asc";
+ where LOGINID='" + id + "' and DAA018='宸插紑宸�' order by DAA016 asc";
+
+ //鏀逛负鎸夌珯浣嶅彿鍙嶆煡浜х嚎锛屽啀閫氳繃浜х嚎鏌ュ嚭宸ュ崟淇℃伅
+ //var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
+ // left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
+ // join MES_LINE b on A.LINEID=b.ID
+ // left join WOMDAA C on C.DAA015=B.LINE_NO
+ // left join mes_items s on s.id = C.daa002
+ // where WORKSNO='" + id+ "' and DAA018='宸插紑宸�' order by DAA016 asc";
return SQLHelper.ExecuteQuery(sql1);
}
--
Gitblit v1.9.3