Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -101,13 +101,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 .between(DmSygdMx::getJssj, from, to)
         );
         if (ObjectUtil.isNotEmpty(sygdMxes)){
-            List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
-                DmSygdMx dmSygdMx = new DmSygdMx();
-                dmSygdMx.setId(dmSygd.getId());
-                dmSygdMx.setZt("2");
-                return dmSygdMx;
-            }).collect(Collectors.toList());
-            this.updateBatchById(collect);
+//            List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
+//                DmSygdMx dmSygdMx = new DmSygdMx();
+//                dmSygdMx.setId(dmSygd.getId());
+//                dmSygdMx.setZt("2");
+//                return dmSygdMx;
+//            }).collect(Collectors.toList());
+//            this.updateBatchById(collect);
 
             //生成作业计划
             List<DmYdjh> dmYdjhs = this.generateYdjh(sygdMxes);

src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java

@@ -68,13 +68,13 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
 //                    .eq("pl", dcPl)
 //            );
         });
-//        List<YdjhImport> qwb = ydjhImports.stream()
-//                .filter(YdjhImport::isAvailable)
-//                .filter(item -> !item.getDcPl().contains("-"))//去除T型材
-//                .filter(item -> !item.getDcPl().contains("/"))//去除T型材
-//                .filter(item -> StrUtil.isNotEmpty(item.getDcFd()))
-//                .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList());
-//        this.execute(qwb);
+        List<YdjhImport> qwb = ydjhImports.stream()
+                .filter(YdjhImport::isAvailable)
+                .filter(item -> !item.getDcPl().contains("-"))//去除T型材
+                .filter(item -> !item.getDcPl().contains("/"))//去除T型材
+                .filter(item -> StrUtil.isNotEmpty(item.getDcFd()))
+                .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList());
+        this.execute(qwb);
 
         List<YdjhImport> list = ydjhImports.stream()
                 .filter(YdjhImport::isAvailable)