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

YL

2022-01-22 7dce710c21f02c3434cb7db21bb29f7a0426d59c

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -276,6 +276,18 @@

                }
                oCN.Commit();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //系统参数  自动审核 
                    {
                        objJsonResult.Verify = "Y";
                    }
                    else
                    {
                        objJsonResult.Verify = "N";
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
@@ -348,7 +360,7 @@
        }
        #endregion

        #region 返回委外工序接收单列表
        #region 返回工序进站接收单列表
        [Route("Cj_StationInBill/get_Display")]
        [HttpGet]
        public object get_Display(string sWhere)
@@ -482,7 +494,7 @@
            {
                string ModRightNameCheck = "MES_StationInBill_Check";
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,CurUserName))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -779,7 +791,7 @@
            {

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, true, HDeleteMan))
                if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, false, HDeleteMan))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;