From 1a8c968a346d18e9b5b92128168ba5bd0767af10 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期一, 08 十二月 2025 10:38:08 +0800
Subject: [PATCH] 修改工单查询，增加前端传输字段
---
service/Wom/WomdaaManager.cs | 27 +++++++++----
entity/Base/ItemDetailModel.cs | 1
service/Wom/WomdaahbManager.cs | 58 ++++++++++++++++-------------
3 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/entity/Base/ItemDetailModel.cs b/entity/Base/ItemDetailModel.cs
index 423cbb1..8beade8 100644
--- a/entity/Base/ItemDetailModel.cs
+++ b/entity/Base/ItemDetailModel.cs
@@ -10,6 +10,7 @@
public string ItemModel { get; set; } // 鐗╁搧鍨嬪彿
public decimal? FQty { get; set; } // 鐢宠鏁伴噺
public decimal? SQty { get; set; } // 璋冨嚭宸叉壂鏁伴噺
+ public decimal? kc { get; set; } // 璋冨嚭宸叉壂鏁伴噺
public string? RecoKw { get; set; } // 鎺ㄨ崘搴撲綅
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 1453a53..860d552 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -195,13 +195,14 @@
if (womdaa.Daa018 == "W:瀹屽伐") throw new Exception("宸ュ崟宸插畬宸�");
var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
- dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw
+ dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw,isnull(e1.kc, 0) as kc
FROM WOMDAB B
LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
LEFT JOIN MES_BACK_FLASH F ON b.dab003 = F.ItemId
LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
left join SYS_USER e on e.sid = c.F_WPVT_BASE_QTR
+ left join (select a.ITEM_ID,a.DEPOT_ID,sum(isnull(QUANTITY,0)) as kc from MES_INV_ITEM_STOCKS a group by a.ITEM_ID,a.DEPOT_ID) e1 on e1.ITEM_ID=c.item_id and e1.DEPOT_ID=c.depot_code
WHERE daa001 = '{0}' AND e.account='{1}' AND ISSUE_TYPE = 1 AND (F.ItemId is null OR F.checkStatus<>1) ORDER BY DAB002", query.daa001,query.userName);
var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
@@ -298,13 +299,23 @@
// })
// .ToList();
- var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
- dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw
- FROM WOMDAB B
- LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
- LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
- LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
- LEFT JOIN MES_BACK_FLASH F ON b.dab003 = F.ItemId
+ var sql =string.Format(@"SELECT c.item_no ItemNo,
+ c.item_name ItemName,
+ c.item_model ItemModel,
+ b.dab006 FQty,
+ b.dab007 SQty,
+ b.dab006 - b.dab007 DSQty,
+ dbo.F_QX_GETRECODEPOTSE(B.dab003, '', '', '') as RecoKw,
+ isnull(e1.kc, 0) as kc
+FROM WOMDAB B
+ LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
+ LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
+ LEFT JOIN MES_BACK_FLASH F ON b.dab003 = F.ItemId
+ LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
+ left join SYS_USER e on e.sid = c.F_WPVT_BASE_QTR
+ left join (select a.ITEM_ID, a.DEPOT_ID, sum(isnull(QUANTITY, 0)) as kc
+ from MES_INV_ITEM_STOCKS a
+ group by a.ITEM_ID, a.DEPOT_ID) e1 on e1.ITEM_ID = c.item_id and e1.DEPOT_ID=c.depot_code
WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 AND (F.ItemId is null OR F.checkStatus<>1) ORDER BY DAB002 ", query.daa001);
var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
diff --git a/service/Wom/WomdaahbManager.cs b/service/Wom/WomdaahbManager.cs
index 4540be1..5eec3a8 100644
--- a/service/Wom/WomdaahbManager.cs
+++ b/service/Wom/WomdaahbManager.cs
@@ -217,32 +217,38 @@
// })
// .ToList();
- var sql =string.Format(@"SELECT max(ahb.GUID) as hbguid,
- m.item_no as itemNo,
- max(m.item_name) as itemName,
- max(m.item_model) as itemModel,
- sum(b.dab006) as FQty,
- sum(b.dab007) as SQty,
- sum(b.dab006) - sum(b.dab007) as DSQty,
- sum(b.dab020) as slsl,
- max(u.fname) as dw,
- max(ahb.DAAHB001) as hbdh,
- dbo.F_QX_GETRECODEPOTSE(MAX(B.DAB003),'','','') AS RecoKw
- FROM WOMDAAHB ahb
- left join WOMDAAHB_LIST ahbl on ahb.GUID = ahbl.MID
- left join WOMDAA A on ahbl.PWORK_NO = a.daa021 and ahb.org_id = a.erp_sczz
- left join WOMDAB b on b.daaGuid = a.guid
- left join WOMCAA ca on a.caaGuid = ca.guid
- LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
- LEFT JOIN MES_WORKSHOP_LINE WL ON WL.ID = A.DAA015
- left join mes_items m on M.ID = b.dab003
- left join MES_UNIT u on u.id = ahbl.UNIT
- left join [dbo].[v_caa] v on v.guid = a.guid
- LEFT JOIN MES_BACK_FLASH F ON b.dab003 = F.ItemId
- WHERE ahb.daahb001 = '{0}' AND D.ISSUE_TYPE = 1 AND (F.ItemId is null OR F.checkStatus<>1)
- group by m.item_no
- ORDER BY m.item_no
- ", query.hbNo);
+ var sql =string.Format(@"SELECT max(ahb.GUID) as hbguid,
+ m.item_no as itemNo,
+ max(m.item_name) as itemName,
+ max(m.item_model) as itemModel,
+ sum(b.dab006) as FQty,
+ sum(b.dab007) as SQty,
+ sum(b.dab006) - sum(b.dab007) as DSQty,
+ sum(b.dab020) as slsl,
+ max(u.fname) as dw,
+ max(ahb.DAAHB001) as hbdh,
+ dbo.F_QX_GETRECODEPOTSE(MAX(B.DAB003), '', '', '') AS RecoKw,
+ max(e1.kc) as kc
+ FROM WOMDAAHB ahb
+ left join WOMDAAHB_LIST ahbl on ahb.GUID = ahbl.MID
+ left join WOMDAA A on ahbl.PWORK_NO = a.daa021 and ahb.org_id = a.erp_sczz
+ left join WOMDAB b on b.daaGuid = a.guid
+ left join WOMCAA ca on a.caaGuid = ca.guid
+ LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
+ LEFT JOIN MES_WORKSHOP_LINE WL ON WL.ID = A.DAA015
+ left join mes_items m on M.ID = b.dab003
+ left join (select a.ITEM_ID, a.DEPOT_ID, sum(isnull(QUANTITY, 0)) as kc
+ from MES_INV_ITEM_STOCKS a
+ group by a.ITEM_ID, a.DEPOT_ID) e1 on e1.ITEM_ID = m.item_id and e1.DEPOT_ID = m.depot_code
+ left join MES_UNIT u on u.id = ahbl.UNIT
+ left join [dbo].[v_caa] v on v.guid = a.guid
+ LEFT JOIN MES_BACK_FLASH F ON b.dab003 = F.ItemId
+ WHERE ahb.daahb001 = '{0}'
+ AND D.ISSUE_TYPE = 1
+ AND (F.ItemId is null OR F.checkStatus <> 1)
+ group by m.item_no
+ ORDER BY m.item_no
+ ", query.hbNo);
var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
--
Gitblit v1.9.3