diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
index 3d6fb22..a79b3be 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
+++ b/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;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java
index 3bb5785..b4dd290 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java
+++ b/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;
 
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
index d3ac185..5fef265 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
+++ b/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;
 
diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
index 3db0bcb..90addc6 100644
--- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
+++ b/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());
diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
index 7b152a9..022fc72 100644
--- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
+++ b/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) {
diff --git a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml b/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml
index 52af712..d8f3968 100644
--- a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml
+++ b/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 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
+        from
+            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
+            left join
+                (select
+                     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