diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
index 4f61666..7d8ce0b 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
@@ -75,18 +75,21 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                     AtomicInteger 板数 = new AtomicInteger(0);
                     //一垮龙门和一垮数控
                     if (item.get切割完成1() != null) {
+                        item.set一垮龙门板数("0");
                         this.getBomSize(item, "7",(size)->{
-                            item.set二跨面板板数(size+"");
+                            item.set一垮龙门板数(size+"");
                             板数.addAndGet(size);
                         });
 
+                        item.set一垮数控板数("0");
                         this.getBomSize(item, "8",(size)->{
-                            item.set二跨面板板数(size+"");
+                            item.set一垮数控板数(size+"");
                             板数.addAndGet(size);
                         });
                     }
 
                     if (item.get切割完成2() != null) {
+                        item.set二跨面板板数("0");
                         this.getBomSize(item, "5",(size)->{
                             item.set二跨面板板数(size+"");
                             板数.addAndGet(size);
@@ -110,23 +113,27 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                             atomicInteger.addAndGet(size);
                             板数.addAndGet(size);
                         });
-
+                        item.set二跨数控板数("0");
                         item.set二跨数控板数(atomicInteger.toString());
                     }
 
                     if (item.get切割完成4() != null) {
+                        item.set三跨平铁板数("0");
+                        AtomicInteger atomicInteger = new AtomicInteger(0);
                         this.getBomSize(item, "6",(size)->{
-                            item.set三跨平铁板数(size.toString());
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
+                        this.getBomSize(item, "13", (size)->{
+                            atomicInteger.addAndGet(size);
                             板数.addAndGet(size);
                         });
 
+                        item.set三跨平铁板数(atomicInteger.toString());
                     }
 
-                    if(item.get曲平铁曲完成()!=null){
-                        this.getBomSize(item, "13", 板数::addAndGet);
-                    }
-
-                    if (item.get切割完成5() != null) {
+                    if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
+                        item.set三跨数控板数("0");
                         this.getBomSize(item, "14",(size)->{
                             item.set三跨数控板数(size+"");
                             板数.addAndGet(size);
@@ -134,6 +141,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                     }
 
                     if (item.get切割完成6() != null) {
+                        item.set四区腹板板数("0");
                         this.getBomSize(item, "11",(size)->{
                             item.set四区腹板板数(size+"");
                             板数.addAndGet(size);
@@ -148,16 +156,13 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                             板数.addAndGet(size);
                         });
 
-                        this.getBomSize(item, "16",(size)->{
-                            atomicInteger.addAndGet(size);
-                            板数.addAndGet(size);
-                        });
+                        item.set四区数控板数("0");
                         item.set四区数控板数(atomicInteger.toString());
                     }
 
-                    if(item.get光电完成()!=null){
-                        this.getBomSize(item, "17", 板数::addAndGet);
-                    }
+//                    if(item.get光电完成()!=null){
+//                        this.getBomSize(item, "17", 板数::addAndGet);
+//                    }
 
                     item.set板数(板数.toString());
                 });
@@ -270,20 +275,16 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                     updateList.add(dmYdjh);
                                 });
                             });
-
-                        }
-
-                        if(item.get曲平铁曲完成()!=null){
                             Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> {
                                 ydjhs.forEach(ydjh->{
-                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get曲平铁曲完成());
+                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成4());
                                     dmYdjh.setId(ydjh.getId());
                                     updateList.add(dmYdjh);
                                 });
                             });
                         }
 
-                        if (item.get切割完成5() != null) {
+                        if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
                             Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> {
                                 ydjhs.forEach(ydjh->{
                                     DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成5());
@@ -312,14 +313,6 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 });
 
                             });
-
-                            Optional.ofNullable(collect.get("16")).ifPresent(ydjhs -> {
-                                ydjhs.forEach(ydjh->{
-                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成7());
-                                    dmYdjh.setId(ydjh.getId());
-                                    updateList.add(dmYdjh);
-                                });
-                            });
                         }
 
                         if(item.get光电完成()!=null){
@@ -335,6 +328,8 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                 });
 
         dmYdjhService.updateBatchById(updateList);
+//        redisTemplate.opsForHash().delete(GJSCGK_SYGDMX_KEY+fileName);
+//        redisTemplate.opsForHash().delete(GJSCGK_TZJH_KEY+fileName);
     }
 
     private DmYdjh updateYdjh(String slrq,String pwrq,String qgrq){
@@ -403,8 +398,6 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
             tzjhService.saveBatch(tzjhList);
             return true;
         });
-//        redisTemplate.opsForHash().delete(GJSCGK_SYGDMX_KEY+fileName);
-//        redisTemplate.opsForHash().delete(GJSCGK_TZJH_KEY+fileName);
     }
 
     private List<YdjhImportNew> updateData(LambdaQueryWrapper<YdjhImportNew> wrapper, Consumer<YdjhImportNew> handler) {
@@ -516,7 +509,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成1());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -530,7 +523,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成1());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -546,7 +539,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成2());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -562,7 +555,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成3());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -576,7 +569,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成3());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -590,7 +583,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成3());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -606,34 +599,31 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成4());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
                             });
                         });
-
-                    }
-
-                    if(item.get曲平铁曲完成()!=null){
                         Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
                             redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_13",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
-                                dmSygdMx.setQgrq(item.get曲平铁曲完成());
+                                dmSygdMx.setQgrq(item.get切割完成4());
                                 dmSygdMx.setQbs("1");
-                                dmSygdMx.setQjgrq(item.get曲外板曲完成());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setQjgrq(item.get曲平铁曲完成());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
                             });
                         });
+
                     }
 
-                    if (item.get切割完成5() != null) {
+                    if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
                         Optional.ofNullable(collect.get("14")).ifPresent(boms -> {
                             redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
                             boms.forEach(bom -> {
@@ -641,12 +631,28 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成5());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
                             });
                         });
+
+//                        Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
+//                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
+//                            boms.forEach(bom -> {
+//                                DmSygdMx dmSygdMx = new DmSygdMx();
+//                                dmSygdMx.setDcCh(item.getDcCh());
+//                                dmSygdMx.setDcPl(item.getDcPl());
+//                                dmSygdMx.setQgrq(item.get切割完成5());
+//                                dmSygdMx.setQbs("1");
+//                                dmSygdMx.setQjgrq(item.get曲外板曲完成());
+//                                dmSygdMx.setJssj(item.get小组配送完成());
+//                                dmSygdMx.setGjjsDz(item.getQfxqrqdz());
+//                                dmSygdMx.setBomData(bom);
+//                                addList.add(dmSygdMx);
+//                            });
+//                        });
                     }
 
                     if (item.get切割完成6() != null) {
@@ -657,7 +663,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成6());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
@@ -673,26 +679,13 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成7());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
                             });
                         });
 
-                        Optional.ofNullable(collect.get("16")).ifPresent(boms -> {
-                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_16",boms.size());
-                            boms.forEach(bom -> {
-                                DmSygdMx dmSygdMx = new DmSygdMx();
-                                dmSygdMx.setDcCh(item.getDcCh());
-                                dmSygdMx.setDcPl(item.getDcPl());
-                                dmSygdMx.setQgrq(item.get切割完成7());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
-                                dmSygdMx.setGjjsDz(item.getQfxqrqdz());
-                                dmSygdMx.setBomData(bom);
-                                addList.add(dmSygdMx);
-                            });
-                        });
                     }
 
                     if(item.get光电完成()!=null){
@@ -703,7 +696,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get光电完成());
-                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setJssj(item.get小组配送完成());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);