From d6502baa8e5610c04127fbee92ff6111e40956f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 13 六月 2023 09:50:02 +0800
Subject: [PATCH] 生产入库、采购入库接口提交
---
VueWebApi/DLL/DAL/AppPurchManagementDAL.cs | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
index f11132a..bf933fb 100644
--- a/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
@@ -34,7 +34,7 @@
//dynamicParams.Add("@purchordercode", purchordercode);
}
//鏌ヨ鏈叧闂笖鏈叏閮ㄥ埌璐х殑閲囪喘璁㈠崟
- sql = @"select distinct A.ordercode from T_PurchaseOrder A
+ sql = @"select distinct A.orderid,A.ordercode from T_PurchaseOrder A
inner join T_PurchaseOrder_sub B on A.ordercode=B.purchaseorder_code
where (isnull(B.quantity,0)-isnull(B.countarrivalquantity,0)+isnull(B.countreturnquantity,0))>0 and A.status<>'CLOSED'" + search;
dynamicParams.Add("@purchordercode", purchordercode);
@@ -71,7 +71,7 @@
try
{
//鏍规嵁閲囪喘璁㈠崟鍙锋煡璇㈢墿鏂欎俊鎭紝渚涘簲鍟嗕俊鎭�
- sql = @"select B.rownumber, B.materiel_code as partcode,M.partname,M.partspec,M.is_batchno,M.is_incheck,
+ sql = @"select B.rownumber,B.sbid, B.materiel_code as partcode,M.partname,M.partspec,M.is_batchno,M.is_incheck,
B.quantity,B.customercode,C.name as customername,A.departmentcode,T.org_name as departmentname,U.code as uomcode,U.name as uomname,
A.ordercode,B.countarrivalquantity,A.acceptdate
from T_PurchaseOrder A
@@ -349,7 +349,7 @@
#endregion
#region[閲囪喘鍏ュ簱鎵弿鏍囩鏉＄爜甯﹀嚭鍒拌揣鍗曚俊鎭痌
- public static ToMessage MesAppPurchInStorScanLabCode(string labcode, string ordercode)
+ public static ToMessage MesAppPurchInStorScanLabCode(string labcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -371,17 +371,6 @@
mes.code = "300";
mes.count = 0;
mes.Message = "褰撳墠鏉＄爜宸插叆搴�!";
- mes.data = null;
- return mes;
- }
- //鍒ゆ柇鎵弿鏍囩鏄惁涓哄綋鍓嶉�夋嫨閲囪喘璁㈠崟涓嬬殑鍒拌揣鍗曟墍鐢熸垚鏍囩
- sql = @"select * from T_BarCodeBill where hsourcebillno=@ordercode";
- dynamicParams.Add("@ordercode", ordercode);
- var data0 = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count < 0)
- {
- mes.code = "300";
- mes.Message = "褰撳墠鏉＄爜涓嶆槸閲囪喘璁㈠崟銆�" + ordercode + "銆戠敓鎴愭潯鐮�!";
mes.data = null;
return mes;
}
@@ -442,8 +431,8 @@
JArray arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(incontent);
list.Clear();
//鍐欏叆鍏ュ簱璁板綍涓昏〃
- sql = @"insert into TK_WMS_Inwh_Main(docu_typecode,hbillno,hsoucenillno,status,hcustomer,hdempart,lm_user,lm_date)
- values(@docu_typecode,@hbillno,@hsoucenillno,@status,@hcustomer,@hdempart,@lm_user,@lm_date)";
+ sql = @"insert into TK_WMS_Inwh_Main(docu_typecode,hbillno,hsoucenillnoid,hsoucenillno,status,hcustomer,hdempart,lm_user,lm_date)
+ values(@docu_typecode,@hbillno,@hsoucenillnoid,@hsoucenillno,@status,@hcustomer,@hdempart,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -451,6 +440,7 @@
{
docu_typecode = "1201",
hbillno = djwo,
+ hsoucenillnoid= arra[0]["hsoucenillnoid"].ToString(),
hsoucenillno = ordercode,
status = "NEW",
hcustomer = arra[0]["customercode"].ToString(),
@@ -932,5 +922,6 @@
return mes;
}
#endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3