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

yangle

2022-08-08 8560519c52cede92c33b89184f39844934c71de4

 WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs

@@ -17,7 +17,7 @@
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public WebServer webserver = new WebServer();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); 

        public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill();   //模具报废入库对应单据类
        public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill();   //模具报废入库对应单据类
@@ -89,7 +89,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -99,6 +99,7 @@
                }

                ds = Sc_MouldOtherOutBill(sWhere,Organization);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -120,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldOtherOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldOtherOutBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
            }

@@ -224,7 +225,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -320,7 +321,7 @@
                }
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'out','{oBill.omodel.HInterID.ToString()}' ";
                    string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus  'out','{oBill.omodel.HInterID.ToString()}' ");
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -359,7 +360,7 @@
        public object DeltetMouldOtherOutBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, false,user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -436,7 +437,7 @@
        {
            //flag=1 审核；  flag=2 反审核
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;