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

zrg

2024-07-03 f923d60d3f03f1dbddf45153ed207974b3624ee1

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

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs

@@ -1164,6 +1164,42 @@
        }
        #endregion

        #region é¦–件 æ ¹æ®å·¥åºæˆ–者生产资源去查询数据
        [Route("CheckBill/GetICMOBillStatusList")]
        [HttpGet]
        public object GetICMOBillStatusList(string sWhere, string user)
        {
            try
            {
               ds = oCN.RunProcReturn("select   * from h_v_Sc_ICMOBillStatus_TmpList where 1=1  " + sWhere.ToString(), " h_v_Sc_ICMOBillStatus_TmpList ");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion 

        #region é¦–件检验单根据源单类型获取信息-源单为生产状态临时表（3722）
        /// <summary>
        ///参数：string sql。