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

yxj

2025-11-28 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1808,12 +1808,12 @@
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 日期 desc", "h_v_Gy_MouldFileList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 条码编号 desc", "h_v_Gy_MouldFileList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by 日期 desc";
                    string sql = sql1 + sWhere + "order by 条码编号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                }

@@ -4921,5 +4921,26 @@
                return objJsonResult;
            }
        }


        [Route("Gy_BarCodeBillList/GetBarCodeBillPermission")]
        [HttpGet]
        public object GetBarCodeBillPermission(string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Print", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无权限查询!";
                objJsonResult.data = 0;
                return objJsonResult;
            }
            else
            {
                objJsonResult.data = 1;
                return objJsonResult;
            }
                
        }
    }
}