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

wtt

2025-07-01 e7ef7f02094dbfc44950cb5bb363b95f0c77c57a

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill_WorkController.cs

@@ -44,7 +44,7 @@
                    sql += "and " + key + " = " + model.GetType().GetProperty(key).GetValue(model);
                }

                LogService.Write(sql);
                //LogService.Write(sql);
                return sql;
            }catch(Exception e)
            {
@@ -82,7 +82,7 @@
                    sWhere = sWhere.Replace("'", "''");
                }
                
                LogService.Write("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'");
                //LogService.Write("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_StepsList '" + stage + "','" + sWhere + "'", "h_p_PM_ProjectBill_StepsList");

                //添加列名
@@ -119,18 +119,18 @@
            try
            {
                var _value = msg["oMainStr"].ToString();
                LogService.Write(_value);
                //LogService.Write(_value);
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0]; // è¡¨å•ä¸»ä½“
                string msg3 = sArray[1]; // æ‰€åœ¨é˜¶æ®µ
                string msg4 = sArray[2]; // æ“ä½œç”¨æˆ·
                LogService.Write(msg2);
                LogService.Write(msg3);
                LogService.Write(msg4);
                //LogService.Write(msg2);
                //LogService.Write(msg3);
                //LogService.Write(msg4);
                msg2 = "[" + msg2 + "]";
                List<ClsPM_ProjectBill_Work> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsPM_ProjectBill_Work>>(msg2);
                LogService.Write(list);
                //LogService.Write(list);
                if (string.Equals(msg3, "jiaodi", StringComparison.InvariantCultureIgnoreCase))
                {
                    list[0].HJiaodiSaveFlag = 1;
@@ -197,7 +197,7 @@
                    sWhere = sWhere.Replace("'", "''");
                }

                LogService.Write("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'");
                //LogService.Write("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'");
                ds = oCN.RunProcReturn("exec h_p_PM_ProjectBill_FeeList '" + stage + "','" + sWhere + "'", "h_p_PM_ProjectBill_FeeList");

                //添加列名
@@ -234,7 +234,7 @@
            try
            {
                var _value = msg["oMainStr"].ToString();
                LogService.Write(_value);
                //LogService.Write(_value);
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0]; // è¡¨å•ä¸»ä½“
@@ -242,7 +242,7 @@
                string msg4 = sArray[2]; // æ“ä½œç”¨æˆ·
                msg2 = "[" + msg2 + "]";
                List<ClsPM_ProjectBill_WorkFee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsPM_ProjectBill_WorkFee>>(msg2);
                LogService.Write(list);
                //LogService.Write(list);
                if (string.Equals(msg3, "workFeeEntry", StringComparison.InvariantCultureIgnoreCase))
                {
                    list[0].HGongfeiluruSaveFlag = 1;