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

yangle

2024-11-28 f9c66dcfca26da4eeba5c87df4ca3916461e37f8

 WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs

@@ -211,7 +211,7 @@

                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));

                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
@@ -807,5 +807,52 @@
        }
        #endregion

        #region 报工台跳转获取数据
        [Route("Qc_PreventErrMouldCheckBill/Qc_PreventErrMouldCheckBillList")]
        [HttpGet]
        public object Qc_PreventErrMouldCheckBillList(string HMaterID,string HProcID,string SCOrder, string User)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Qc_PreventErrMouldCheckBillMain_Edit", 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HMaterID == null || HMaterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "物料不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }               

                ds = oCN.RunProcReturn("exec h_p_PreventErrMouldCheck '" + HMaterID + "','" + HProcID + "','" + SCOrder + "'", "h_p_PreventErrMouldCheck");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                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

    }
}