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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs b/VueWebApi/DLL/DAL/PurchaseOrderDAL.cs
index b18c257..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,13 +105,13 @@
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
left join TUom T on M.uom_code=T.code
left join T_Sec_Stck S on A.warehousecode=S.code
- where A.purchaesorder_code=@purodercode";
+ where A.purchaseorder_code=@purodercode";
dynamicParams.Add("@purodercode", purodercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
@@ -232,8 +231,18 @@
var dynamicParams = new DynamicParameters();
try
{
- //鍒ゆ柇鏄惁鐢熸垚閲囪喘鍒拌揣鍗�
-
+ //鍒ゆ柇鏄惁鐢熸垚浜嗛噰璐埌璐у崟
+ sql = @"select * from T_PurchaseArrivalOrder where hsourcebillno=@po";
+ dynamicParams.Add("@po", po);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠閲囪喘璁㈠崟宸茬敓鎴愬埌璐у崟!";
+ mes.data = null;
+ return mes;
+ }
//鏇存柊閲囪喘璁㈠崟涓昏〃瀹℃牳浜恒�佸鏍告椂闂�
sql = @"update T_PurchaseOrder set auditorusercode=@username,auditordate=@lm_date where ordercode=@po";
list.Add(new { str = sql, parm = new { username="",po = po, lm_date ="" } });
@@ -264,5 +273,43 @@
return mes;
}
#endregion
+
+ #region[閲囪喘璁㈠崟鍏抽棴]
+ public static ToMessage ClosedPurchaseOrder(string po, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鏇存柊閲囪喘璁㈠崟鐘舵��
+ sql = @"update T_PurchaseOrder set status='CLOSED' where ordercode=@po";
+ list.Add(new { str = sql, parm = new { po = po} });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3