From 122e343b705b057e71f1ef677d18237900844a16 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 12 九月 2025 10:51:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsGy_Material_Ctl.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 1307760..d219254 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,HMaterRuleExternType, HMaterRuleExternType1, HCircularKnittingMachineCode" +
+ ",HProjectBillMainID,HDivisionID,HCubicleQty,HMakeEmp,HMaterRuleExternType, HMaterRuleExternType1, HCircularKnittingMachineCode,HBarCodePrintName" +
") " +
" 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 + "'" +
@@ -63,6 +63,7 @@
"','" + oModel.HMaterRuleExternType +
"','" + oModel.HMaterRuleExternType1 +
"','" + oModel.HCircularKnittingMachineCode +
+ "','" + oModel.HBarCodePrintName +
"')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -235,10 +236,11 @@
",HProjectBillMainID='" + oModel.HProjectBillMainID + "'" +
",HDivisionID='" + oModel.HDivisionID + "'" +
",HLotcardQty='" + oModel.HLotcardQty + "'" +
- ",HCubicleQty='" + oModel.HCubicleQty + "'" +
+ ",HCubicleQty='" + oModel.HCubicleQty + "'" +
",HMaterRuleExternType='" + oModel.HMaterRuleExternType + "'" +
",HMaterRuleExternType1='" + oModel.HMaterRuleExternType1 + "'" +
",HCircularKnittingMachineCode='" + oModel.HCircularKnittingMachineCode + "'" +
+ ",HBarCodePrintName='" + oModel.HBarCodePrintName + "'" +
" Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1