1.作业计划下发和查询表格列显示内容修正

2.月度计划和作业计划增加余料标识
3.修复看板考勤接口人员信息查询条件缺失导致查询总人数与班次合计人数不符的问题

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java

@@ -180,6 +180,8 @@ public class DmSygdMx implements Serializable {
     @ApiModelProperty(value = "前批余料代")
     private Double bcqpyld;
 
+    private String ylbs;//余料标识
+
     private String parentId;
 
     private String ylbhgg;

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.bean.jhgk;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -190,6 +191,9 @@ public class DmSygdMxLj implements Serializable {
 
     private String ylbhgg;
 
+    @TableField(exist = false)
+    private String ylbs; //余料标识
+
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -232,6 +232,8 @@ public class DmYdjh implements Serializable {
     @ApiModelProperty(value = "前批余料代")
     private Double bcqpyld;
 
+    private String ylbs;//余料标识
+
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 

src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java

@@ -69,7 +69,7 @@ public class KbanController {
     @GetMapping("kq")
     public ResultBean<?> kq(){
         List<DmBzry> ryList=cqService.list(Wrappers.<DmBzry>lambdaQuery()
-                .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt));
+                .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt).ne(DmBzry::getZt,""));
 
         Map<String,Object> map=new HashMap<>();
         map.put("total",ryList.size());

src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java

@@ -5,13 +5,16 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
 import com.dsic.gj_erp.bean.jhgk.DmSygd;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
 import com.dsic.gj_erp.pc.Manager;
+import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
@@ -32,6 +35,7 @@ public class 三月滚动接口 {
     private final DmSygdMxLjService ljService;
     private final DmSygdMxService sygdMxService;
     private final DmSygdService sygdService;
+    private final DmBchxylpService bchxylpService;
 
     @Transactional
     public ResultBean 生成三月滚动(String begin, String end) {

src/main/resources/mappers/jhgk/DmSygdxqMapper.xml

@@ -153,12 +153,17 @@
             dm_bom.bcljtlzl,
             dm_bom.ylbhgg,
             dm_bom.bcqpyld,
+            bc.sfyl ylbs,
             REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') as id
-
+        from
-        from dm_sygdxq LEFT JOIN 	dm_bom
+            dm_sygdxq LEFT JOIN dm_bom on dm_bom.dcch = dm_sygdxq.DC_CH and dm_bom.pl = dm_sygdxq.DC_PL and dm_bom.fd = dm_sygdxq.DC_FD
-                                    on dm_bom.dcch = dm_sygdxq.DC_CH
+            left join
-                                        and dm_bom.pl = dm_sygdxq.DC_PL
+                (select
-                                        and dm_bom.fd = dm_sygdxq.DC_FD
+                     dc_ch,dc_pl,tzbh,sfyl,rn
+                 from
+                     (select dc_ch,dc_pl,tzbh,sfyl,
+                        ROW_NUMBER() over(PARTITION by dc_ch ,dc_pl,tzbh order by tzbh) rn from dm_bchxylp) a where a.rn=1)  bc
+            on dm_bom.dcch =bc.dc_ch and dm_bom.pl =bc.dc_pl and dm_bom.tzbh =bc.tzbh
         where
             dm_sygdxq.xzglxq between #{begin} and #{end} and dm_bom.type = 'b'
         ORDER BY dm_sygdxq.xzglxq,dm_sygdxq.DC_CH,dm_sygdxq.DC_PL,dm_bom.TZBH,dm_sygdxq.DC_FD