diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index 46d8962..0ee47e3 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -119,7 +119,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
         Map<String, List<DmSygdMx>> mxMap = list.stream().collect(Collectors.groupingBy(x -> x.getKw() + x.getZl()));
         //加工工序list
         List<EmSbcnp> sbcnp = sbcnpService.list(new QueryWrapper<EmSbcnp>().orderByDesc("tzbh,zl,jgsx"));
-        Map<String, List<EmSbcnp>> cnMap = sbcnp.stream().collect(Collectors.groupingBy(l -> l.getKw().substring(1) + l.getZl()));
+        Map<String, List<EmSbcnp>> cnMap = sbcnp.stream().collect(Collectors.groupingBy(l -> l.getTzbh() + l.getZl()));
         for (String ljkey : mxMap.keySet()) {
             for (String cnkey : cnMap.keySet()) {
                 if (ljkey.equals(cnkey)) {
@@ -148,12 +148,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                                 l.setPkrq(getRq(ljgs, l.getJssj()));
                             }
 
-                            if ("03,04,05,07".indexOf(cn.getGx()) > 0) {
+                            if ("03,04,05,06,07".indexOf(cn.getGx()) > -1) {
                                 ljgs += l.getQgcd() / cn.getDegs();
                                 l.setQgrq(getRq(ljgs, l.getJssj()));
                             }
                             // 划线
-                            if (cn.getGx().equals("01")) {
+                            if ("01,02".indexOf(cn.getGx()) > -1) {
                                 ljgs += l.getHxcd() / cn.getDegs();
                                 l.setHxrq(getRq(ljgs, l.getJssj()));
                             }
@@ -457,10 +457,9 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
         //1.查询未来3个月明细信息
         //测试
 //        List<DmSygdMx> list=null;
-//        String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01");
-//        String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd");
-        String begin = "2023/08/01";
-        String end = "2023/10/31";
+        String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01");
+        String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd");
+
         List<DmSygdMx> list = this.list(new QueryWrapper<DmSygdMx>()
                 .between("jssj",
                         begin,
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 90379f3..9397205 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -218,11 +218,24 @@
         dhxx.ddmc         as hth,
         dhxx.dc_ch        as xhth,
         dhxx.HDSL         as dhsl,
-        dhxx.WPHD         as hd,
-        dhxx.WPCD         as cd,
-        dhxx.WPKD         as kd,
+        (CASE dm_ydjh.wpgg
+             WHEN null THEN null
+             WHEN '' THEN null
+             ELSE CAST( left(dm_ydjh.wpgg,charindex('*',dm_ydjh.wpgg,1)-1)as char)
+            END)as          hd,
+        (CASE dm_ydjh.wpgg
+             WHEN null THEN null
+             WHEN '' THEN null
+             ELSE CAST(  SUBSTRING(dm_ydjh.wpgg, charindex('*',dm_ydjh.wpgg,charindex('*',dm_ydjh.wpgg,1)+1)+1,LEN(dm_ydjh.wpgg))as char)
+            END)         as cd,
+        (CASE dm_ydjh.wpgg
+             WHEN null THEN null
+             WHEN '' THEN null
+             ELSE CAST( left(SUBSTRING(dm_ydjh.wpgg,charindex('*',dm_ydjh.wpgg,1)+1, LEN(dm_ydjh.wpgg)),
+            charindex('*',SUBSTRING(dm_ydjh.wpgg,charindex('*',dm_ydjh.wpgg,1)+1, LEN(dm_ydjh.wpgg)),1)-1)as char)
+            END)         as kd,
         dhxx.DHSL         as xqsl
-        from dm_ydjh ,
+        from dm_ydjh left join
         (select MS_DDJBP.CGFLM,
         MS_DDJBP.DDH,
         MS_DDJBP.ddmc       as ddmc,
@@ -248,7 +261,8 @@
         and im_crklsz.HDLX  <![CDATA[ <> ]]> '99'
         GROUP BY MS_DDJBP.CGFLM, MS_DDJBP.DDH, MS_DDJBP.ddmc, MS_DDMXP.dc_ch, MS_DDMXP.WPHD, MS_DDMXP.WPCD,
         MS_DDMXP.WPKD, MS_DDMXP.RKXH, MS_DDJBP.dhqdh) dhxx
-        where  dhxx.dhqdh = dm_ydjh.dhqd and dhxx.dhqdh is not null and
+        on dhxx.dhqdh = dm_ydjh.dhqd
+        where
         dm_ydjh.slrq BETWEEN #{begin} and #{end}
         ORDER BY dm_ydjh.dc_ch,
         dm_ydjh.dc_pl