From 0e4d5df5bc966405fee1f4451d3e4143d2a54bbd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 20 八月 2025 09:32:53 +0800
Subject: [PATCH] 解决 合并 导致的部分残留数据导致无法生成解决方案的问题
---
WebAPI/DLL/ClsGy_Material_Ctl.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index a150dc8..34ceb98 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -32,7 +32,7 @@
",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate" +
",HLotcardQty" +
- ",HProjectBillMainID,HDivisionID,HCubicleQty,HMakeEmp" +
+ ",HProjectBillMainID,HDivisionID,HCubicleQty,HMakeEmp,HMaterRuleExternType" +
") " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -60,6 +60,7 @@
"','" + oModel.HDivisionID +
"','" + oModel.HCubicleQty +
"','" + oModel.HMakeEmp +
+ "','" + oModel.HMaterRuleExternType +
"')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠g爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -233,6 +234,7 @@
",HDivisionID='" + oModel.HDivisionID + "'" +
",HLotcardQty='" + oModel.HLotcardQty + "'" +
",HCubicleQty='" + oModel.HCubicleQty + "'" +
+ ",HMaterRuleExternType='" + oModel.HMaterRuleExternType + "'" +
" Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -285,19 +287,24 @@
return true;
}
- public bool ModifyByIDListDynamic(string HItemID_List, string paramStr)
+ public bool ModifyByIDListDynamic(string HItemID_List, string paramStr, List<Models.ClsGy_Material_Model> models)
{
var sql = "Update " + MvarItemKey + " set ";
sql += paramStr;
sql += (" Where HItemID in " + HItemID_List);
-
+ // 杈撳嚭 淇敼璇彞鍒版棩蹇楁枃浠�
+ LogService.Write("Update: " + sql);
oCn.BeginTran();
oCn.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- //
+ foreach (var model in models)
+ {
+ // 杈撳嚭 淇敼鍓嶅璞� 鍒� 鏃ュ織鏂囦欢
+ LogService.Write(model);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + model.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + model.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
oCn.Commit();
return true;
}
--
Gitblit v1.9.1