From 01b5ef474e1a5d8dc682b64312f23bdbb0fdf3a7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 12 四月 2023 16:26:48 +0800
Subject: [PATCH] 1.采购到货接口修改 2.停用设备过滤
---
VueWebApi/DLL/DAL/PurchaseOrderDAL.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
index a5f8513..ce53afb 100644
--- a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
+++ b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
@@ -74,8 +74,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select case when A.status='NEW' then '鏂拌鍗�' when A.status='CHECK' then '宸插鏍�' when A.status='CLOSED' then '宸插叧闂�' end as status,
- A.orderdate,A.ordercode,T.org_name as deptname,C.name as customername,A.saleorderCode,A.acceptdate,A.lm_user,A.lm_date,U.username as auditoruser,A.auditordate
+ var sql = @"select A.status,A.orderdate,A.ordercode,T.org_name as deptname,C.name as customername,A.saleorderCode,A.acceptdate,A.lm_user,A.lm_date,U.username as auditoruser,A.auditordate
from T_PurchaseOrder A
left join TOrganization T on A.departmentcode=T.org_code
left join TCustomer C on A.customercode=C.code
@@ -106,7 +105,7 @@
try
{
//鑾峰彇閲囪喘璁㈠崟鐗╂枡淇℃伅
- sql = @"select M.partcode,M.partname,M.partspec,T.name as uomname,A.quantity,A.countarrivalquantity,A.countInquantity,
+ sql = @"select M.partcode,M.partname,M.partspec,T.name as uomname,A.quantity,A.countarrivalquantity,A.countInquantity,A.countreturnquantity,
A.acceptdate,S.name as housename,M.is_incheck
from T_PurchaseOrder_sub A
left join TMateriel_Info M on A.materiel_code=M.partcode
--
Gitblit v1.9.3