Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2024-09-05 365936930b2fb6e5a86cc6dda878fb24f15f0b9e

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DutyBillController.cs

@@ -226,9 +226,9 @@
                    //保存完毕后处理
                    oCN.RunProc("Insert into Gy_Duty " +
                       " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HUserGroupID" +
                       ",HLevel,HEndFlag,HStopflag,HRemark) " +
                       ",HLevel,HEndFlag,HStopflag,HRemark,HUserCode) " +
                       " Values('" + Duty.HNumber + "','" + Duty.HName + "','" + Duty.HHelpCode + "','" + Duty.HShortNumber + "'," + Duty.HParentID.ToString() + "," + Duty.HUserGroupID.ToString() +
                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "','" + Duty.HUserCode + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
@@ -242,6 +242,7 @@
                        ",HUserGroupID=" + Duty.HUserGroupID.ToString() +
                        ",HEndflag=" + Duty.HEndFlag +
                        ",HStopflag=" + Convert.ToString(Duty.HStopflag ? 1 : 0) +
                        ",HUserCode="+Duty.HUserCode+
                        ",HRemark= '" + Duty.HRemark + "' Where HItemID=" + Duty.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                }