修改页码及排序

杨乐

2022-02-10 777db38816776abbe4b864d26a6c0381b75e8f9d

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -34,11 +34,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 ", "h_v_Gy_MaterialList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by 物料代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                }

@@ -283,7 +283,7 @@
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -353,7 +353,7 @@
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -363,12 +363,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 hmainid 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 hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -457,18 +457,28 @@
        /// </summary>
        [Route("Gy_BarCodeBillList/GetBarCodeBillList")]
        [HttpGet]
        public object GetBarCodeBillList(string sWhere)
        public object GetBarCodeBillList(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 日期 desc", "h_v_IF_BarCodeBillList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + "order by 日期 desc";
                    string sql = sql1 + sWhere + "order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -517,7 +527,7 @@
            string msg4 = sArray[2].ToString();//当前人

            oCN.BeginTran();
            if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
            if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -594,6 +604,8 @@
                int HCaveQty = mainList[0].HCaveQty;
                int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
                int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;
                int HNowSupID = mainList[0].HNowSupID;
                int HNowSupTypeID = mainList[0].HNowSupTypeID;



@@ -606,7 +618,7 @@
                ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
                ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
                ") " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
@@ -616,7 +628,7 @@
                "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
                ") ");

@@ -673,7 +685,7 @@
            string msg4 = sArray[2].ToString();//当前人
            try
            {
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -732,7 +744,8 @@
                int HCaveQty = mainList[0].HCaveQty;
                int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
                int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;

                int HNowSupID = mainList[0].HNowSupID;
                int HNowSupTypeID = mainList[0].HNowSupTypeID;

                //若MAINDI重复则重新获取
                oCN.BeginTran();
@@ -781,6 +794,8 @@
                ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
                ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                ",HMouldOWNER='" + HMouldOWNER + "'" +
                ",HNowSupID="+HNowSupID.ToString()+
                ",HNowSupTypeID="+HNowSupTypeID.ToString()+
                ",HProdWeight=" + HProdWeight.ToString() +
                " where HInterID=" + HInterID.ToString());

@@ -850,7 +865,7 @@
            DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -967,7 +982,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;