1.增加作业计划作废功能,用于修正由于基础数据错误导致无法上料的错误作业计划为作废状态

2.修复作业计划查询相关作废状态查询问题

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")

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<Integer> addMateria(@RequestBody DmMateria[] dmMaterias,HttpServletRequest req){
         return this.dmMateriaService.addMateria(dmMaterias,req);
     }

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<TpbhPlan> 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<TpbhPlan> 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<TpbhPlan> list,HttpServletRequest request){
         String userName=(String) request.getAttribute("username");
         String userCode=(String) request.getAttribute("yhdm");

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'
         <if test=" dcCh!=null and dcCh!=''">
             and   dm_ydjh.dc_ch=#{dcCh}