乔一指引卡变更 帅威 计划平台功能优化

yangle

2023-09-19 ea64c8992b1345063f95e860fde9d7482150a89b

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutBillController.cs

@@ -24,16 +24,38 @@

        [Route("Kf_MateOutBill/GetMateOutBillList")]
        [HttpGet]
        public object GetMateOutBillList(string sWhere)
        public object GetMateOutBillList(string sWhere,string user)
        {
            try
            {
                ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList " + sWhere + " order by æ—¥æœŸ desc", "h_v_IF_MateOutBillList");
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBillQuery", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList " + sWhere + " order by hmainid desc", "h_v_IF_MateOutBillList");

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {
@@ -57,7 +79,7 @@
        public object set_DeleteBill(string HInterID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Drop", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -151,7 +173,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -258,7 +280,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -381,7 +403,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,物料代码 HMaterCode ,物料名称 HMaterName,规格型号 HMaterSpec,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName,应收数量 HQtyMust,实收数量 HQty,单价 HPrice,金额 HMoney,HWHID,领料仓库代码 HWHCode,领料仓库 HWHName,表体备注 HRemark
                    ds = oCN.RunProcReturn(string.Format(@"select HMaterID ,物料代码 HMaterCode ,物料名称 HMaterName,物料分类 HMaterRuleType,规格型号 HMaterSpec,用量 HRate,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName,应收数量 HQtyMust,实收数量 HQty,单价 HPrice,金额 HMoney,HWHID,领料仓库代码 HWHCode,领料仓库 HWHName,表体备注 HRemark
from h_v_IF_MateOutBillList"), "H_V_IF_MATEOUTBILLLIST");

                }
@@ -389,7 +411,7 @@
                {

                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
                    string sql1 = string.Format(@"select HMaterID ,物料代码 HMaterCode ,物料名称 HMaterName,规格型号 HMaterSpec,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName,应收数量 HQtyMust,实收数量 HQty,单价 HPrice,金额 HMoney,HWHID,领料仓库代码 HWHCode,领料仓库 HWHName,表体备注 HRemark
                    string sql1 = string.Format(@"select HMaterID ,物料代码 HMaterCode ,物料名称 HMaterName,物料分类 HMaterRuleType,规格型号 HMaterSpec,用量 HRate, HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName,应收数量 HQtyMust,实收数量 HQty,单价 HPrice,金额 HMoney,HWHID,领料仓库代码 HWHCode,领料仓库 HWHName,表体备注 HRemark
from h_v_IF_MateOutBillList WHERE 1=1");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "H_V_IF_MATEOUTBILLLIST");
@@ -436,13 +458,15 @@
            string refSav = sArray[2].ToString();
            string msg4 = sArray[3].ToString();

            DBUtility.ClsPub.CurUserName = msg4;

            string UserName = "";
            string s = "";
            ListModels oListModels = new ListModels();
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -614,6 +638,54 @@
        }
        #endregion

        #region æ ¹æ®å·¥è‰ºå•å·(工序流转卡号)获取信息
        [Route("Kf_MateOutBill/getMainDataByHProcExchBillNo")]
        [HttpGet]
        public ApiResult<DataSet> getMainDataByHProcExchBillNo(string HProcExchBillNo)
        {
            if (string.IsNullOrEmpty(HProcExchBillNo))
                return new ApiResult<DataSet> { code = -1, msg = "工艺单号不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            string sql = "select top(1) " +
                "a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,a.HInterID HProcExchInterID,a.HMaterID,m1.HName HMaterName,a.HMaterModel HModel,a.HMaterModel2 HModel2,a.HCusID,c1.HName HCusName,a.HWeight" +
                " from Sc_ProcessExchangeBillMain AS a " +
                " LEFT OUTER JOIN Gy_Material AS m1 on a.HMaterID = m1.HItemID " +
                " LEFT OUTER JOIN Gy_Customer AS c1 on a.HCusID = c1.HItemID " +
                " where a.HBillNo = '" + HProcExchBillNo + "'";

            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");


            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在单号" };

            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

        #region æ ¹æ®ç‰©æ–™å†…码获取物料信息
        [Route("Kf_MateOutBill/getMaterialByMaterID")]
        [HttpGet]
        public ApiResult<DataTable> getMaterialByMaterID(Int64 HMaterID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
                " from Gy_Material AS a " +
                " LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
                " where a.HItemID =" + HMaterID;

            var dataSet = oCN.RunProcReturn(sql, "Gy_Material");


            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataTable> { code = -1, msg = "不存在该物料" };

            return new ApiResult<DataTable> { code = 1, msg = "查询成功", data = dataSet.Tables[0] };
        }
        #endregion

        #region å™¨å…·é‡‡è´­å…¥åº“单审核/反审核
        [Route("Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill")]
        [HttpGet]
@@ -621,7 +693,7 @@
        {
            //flag=1 å®¡æ ¸ï¼›  flag=2 åå®¡æ ¸
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Check", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Check", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;