From 7f6310aa085749df1e1c66bf6d48b3850e332107 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:09:13 +0800
Subject: [PATCH] 送货单编辑保存报错回滚；生成送货单校验数量，金蝶表连接方式取值改为取配置文件上的金蝶数据库
---
WebAPI/DLL/DAL.dll | 0
WebAPI/Controllers/POInStockController.cs | 43 +++++++++++++++++++++++++------------------
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 8c0b258..d5a138c 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -457,7 +457,7 @@
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
- //oCn.BeginTran(); //寮�濮嬩簨鐗�
+ oCn.BeginTran(); //寮�濮嬩簨鐗�
if (HOpType.ToString() == "edit"/*oBill.omodel.HInterID != 0 && oBill.omodel.HInterID.ToString() != null && oBill.omodel.HInterID.ToString() != "undefined"*/)
{
@@ -469,7 +469,7 @@
}
if (bResult)
{
- //oCn.Commit(); //鎻愪氦浜嬬墿
+ oCn.Commit(); //鎻愪氦浜嬬墿
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -480,7 +480,7 @@
}
else
{
- //oCn.RollBack(); //鍥炴粴浜嬬墿
+ oCn.RollBack(); //鍥炴粴浜嬬墿
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -491,7 +491,7 @@
}
catch (Exception e)
{
- //oCn.RollBack(); //鍥炴粴浜嬬墿
+ oCn.RollBack(); //鍥炴粴浜嬬墿
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
@@ -1620,10 +1620,10 @@
/// <returns></returns>
public object TestSaverPOInStock(string ids, string entryids)
{
- //List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
- //List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
- List<string> mylist = new List<string>(ids.Split(',').Distinct());
- List<string> entryList = new List<string>(entryids.Split(',').Distinct());
+ List<string> mylist = new List<string>(ids.Split(','));//.Distinct()
+ List<string> entryList = new List<string>(entryids.Split(','));//.Distinct()
+ //List<string> mylist = new List<string>(ids.Split(',').Distinct());
+ //List<string> entryList = new List<string>(entryids.Split(',').Distinct());
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
if (FCusName == "澶忓疂鐢靛櫒" && mylist.Count > 1)
@@ -1643,15 +1643,15 @@
objJsonResult = TestPOOrder(entryids);
if (objJsonResult.code == "0")
return objJsonResult;
-
- //if (mylist.Count != entryList.Count)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "涓诲唴鐮佷笌瀛愬唴鐮佹暟閲忎笉涓�鑷达紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
+ if (mylist.Count != entryList.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓诲唴鐮佷笌瀛愬唴鐮佹暟閲忎笉涓�鑷达紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
for (int i = 0;i < mylist.Count;i++)
{
//閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗曞墠鎺у埗
@@ -1681,7 +1681,14 @@
//鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
//瀹夌憺锛欰IS20220914133941 鐟炰笌鐞細AIS20220308151944 鏈湴锛欰IS20210811135644 澶忓疂锛歴rv_lnk.AIS20211130140219.dbo. 鍑礉锛欰IS20210820164804 娣诲悍锛欰IS20240809105013
- DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join srv_lnk.AIS20211130140219.dbo.T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
+ //DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺,T1.hrelationqty as 宸插彂璐ф暟閲�,T1.hqty as 璁㈠崟鏁伴噺,鍗曟嵁鍙�,鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join AIS20210811135644..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
+
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+
+ string sql2 = string.Format(@"select T1.hqty - T1.hrelationqty + q.FMRBQTY as hqty, q.FRemainReceiveQty as 鍓╀綑鏀舵枡鏁伴噺, T1.hrelationqty as 宸插彂璐ф暟閲�, T1.hqty as 璁㈠崟鏁伴噺, 鍗曟嵁鍙�, 鐗╂枡缂栫爜 from H_v_SRM_POOrderBillList t1 left join {0}..T_PUR_POORDERENTRY_R q on q.FENTRYID = t1.HEntryID where hentryid in ({1})", kdTbaleName, string.Join(", ", entryList));
+
+ DataSet ds = oCn.RunProcReturn(sql2, "H_v_SRM_POOrderBillList");
+
DataTable dt = ds.Tables[0];
if (dt.Rows.Count > 0)
{
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 7abab81..8ce6e48 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
--
Gitblit v1.9.1