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

chenhaozhe

2026-03-06 49f60ae2d2a6b5bc9623ed41e22c57412852e49c

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

@@ -59,6 +59,46 @@
        }
        #endregion

        #region  å™¨å…·çŠ¶æ€ ç¼–辑初始化
        [Route("Gy_MouldStatus/Gy_MouldStatusEditInit")]
        [HttpGet]
        public object Gy_MouldStatusEditInit(string sWhere, string user, string Organization)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql1 = string.Format(@"select * from h_v_Gy_MouldStatus_Edit where ä½¿ç”¨ç»„织='" + Organization + "'");

                string sql = sql1 + sWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldStatus_Edit");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  å™¨å…·çŠ¶æ€ ç¼–辑
        [Route("Gy_MouldStatus/Gy_MouldStatusEdit")]
        [HttpPost]
@@ -103,7 +143,7 @@
                    }

                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select * from  Gy_MouldStatus where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_MouldStatus");
                    ds = oCN.RunProcReturn("select * from  Gy_MouldStatus where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= " + oItem.HUSEORGID, "Gy_MouldStatus");
                    if (oItem.HItemID == 0)
                    {
                        if (ds.Tables[0].Rows.Count > 0)