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

yusijie

2023-11-15 33cfe29fcdd731c3c759dcae74bdcfaeecd309ea

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -978,6 +978,9 @@
        {
            try
            {
                DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill();
                string s = "";

                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBill_Drop", 1, false, user))
                {
@@ -985,6 +988,24 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据有误！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //判断是否可编辑
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据已经被审核，不允许删除！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

@@ -1015,11 +1036,11 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by hmainid desc", "h_v_IF_SellOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 单据号 desc", "h_v_IF_SellOutBillList");
            }
            else
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_SellOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList where 1=1 " + sWhere + " order by 单据号 desc", "h_v_IF_SellOutBillList");
            }
        }
        #endregion