From 98eacfc0146b373463ecf19451ae31f11371406e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 11 Jul 2025 10:48:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD,=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E4=BF=AE=E6=AD=A3=E7=94=B1=E4=BA=8E=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=B8=8A=E6=96=99=E7=9A=84=E9=94=99=E8=AF=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92=E4=B8=BA=E4=BD=9C=E5=BA=9F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=202.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/controller/jhgk/DmYdjhController.java | 2 +- .../gj_erp/controller/txzz/jhgl/DmMateriaController.java | 3 ++- .../gj_erp/controller/txzz/jhgl/TpbhPlanController.java | 7 ++++--- src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index 7e1fcb1..83d1263 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -96,7 +96,7 @@ public class DmYdjhController { .eq(StrUtil.isNotEmpty(map.get("dcch")),"dc_ch",map.get("dcch")) .eq(StrUtil.isNotEmpty(map.get("dcpl")),"dc_pl",map.get("dcpl")) .eq("lx","B") - .ne("zt","-1") + .ne("zt","-1").ne("zt","99") // .and(wp->wp.ne("zt", "-1").or().ne("zt","99")) .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb") diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java index a7a1a01..94c99d3 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java +++ b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java @@ -4,6 +4,7 @@ package com.dsic.gj_erp.controller.txzz.jhgl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.Authorization; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.sy.SyDictItem; @@ -145,7 +146,7 @@ public class DmMateriaController { */ @ApiOperation("物品添加") @PostMapping("/add") - @Authorization + @AuthFunction public ResultBean addMateria(@RequestBody DmMateria[] dmMaterias,HttpServletRequest req){ return this.dmMateriaService.addMateria(dmMaterias,req); } diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java index 37a63fb..1160049 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java +++ b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.txzz.jhgl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.Authorization; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.txzz.jhgl.TpbhPlan; @@ -55,7 +56,7 @@ public class TpbhPlanController { @ApiOperation("托盘需求计划提交") @PostMapping("submit") - @Authorization + @AuthFunction public ResultBean submit(@RequestBody List list, HttpServletRequest request){ String userName=(String) request.getAttribute("username"); String userCode=(String) request.getAttribute("yhdm"); @@ -82,7 +83,7 @@ public class TpbhPlanController { * 审核 */ @PostMapping("sh") - @Authorization + @AuthFunction public ResultBean sh(@RequestBody List list,HttpServletRequest request){ String userName=(String) request.getAttribute("username"); String userCode=(String) request.getAttribute("yhdm"); @@ -100,7 +101,7 @@ public class TpbhPlanController { * 审批 */ @PostMapping("sp") - @Authorization + @AuthFunction public ResultBean sp(@RequestBody List list,HttpServletRequest request){ String userName=(String) request.getAttribute("username"); String userCode=(String) request.getAttribute("yhdm"); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index f5af4e6..7e952c3 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1002,7 +1002,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} THEN 1 ELSE 0 END) AS qg_count4kw FROM dm_ydjh - where 1=1 AND lx='B' and ( isnull(dm_ydjh.zt,'') != '-1' or isnull(dm_ydjh.zt,'') !='99' ) + where 1=1 AND lx='B' and ( isnull(dm_ydjh.zt,'') != '-1' and isnull(dm_ydjh.zt,'') !='99' ) and dm_ydjh.kw!='17' and dm_ydjh.dc_ch=#{dcCh}