1.按月度计划名称查询月度计划导入内容,月度计划按导入excel查看

2.月度计划导入时按照基础数据计算各工序实际数量
3.优化月度计划导入功能
4.看板增加组立流向
5.批量修改作业区
6.调整线表计划,取消已完工船只

src/main/java/com/dsic/gj_erp/GjErpApplication.java

@@ -7,6 +7,7 @@ import com.jcraft.jsch.Session;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -20,10 +21,10 @@ import java.util.Properties;
 
 @EnableAsync
 @EnableMPP
-@SpringBootApplication(exclude = {
+@SpringBootApplication
-        DataSourceAutoConfiguration.class} )
 @EnableSwagger2
-@EnableTransactionManagement
+//@EnableTransactionManagement
+@MapperScan({"com.dsic.gj_erp.mapper"})
 public class GjErpApplication {
 
     public static void main(String[] args) {

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

@@ -101,6 +101,8 @@ public class YdjhImport {
 
     private int importIndex;
 
+    private String fileName;
+
     @ApiModelProperty(value = "前方需求小组期")
     private String qfxqrqxz;
 

src/main/java/com/dsic/gj_erp/bean/jhgk/excel/JhxfExcel.java

@@ -206,7 +206,7 @@ public class JhxfExcel {
     private Boolean qwbBs=false;
 
     public boolean isAvailable(){
-        return !StrUtil.isAllEmpty(this.sl,this.xcpw,this.pw,this.dbqgks,this.ykpkjs,this.lmqgks,this.lmqgjs,
+        return !StrUtil.isAllEmpty(this.dcCh,this.dcPl,this.dcFd,this.sl,this.xcpw,this.pw,this.dbqgks,this.ykpkjs,this.lmqgks,this.lmqgjs,
                 this.ekskks,this.ekpkjs,this.skskqgks,this.skpkjs,this.ptks,this.ptjs,this.qpt_zjs,this.qptjs,
                 this.qwbjs,this.fbqgks,this.fbqgjs,this.skqgks,this.pkqgjs,this.mbjb,this.xcmb,this.fdxq,this.gdjs);
     }

src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
 
-@Configuration
+//@Configuration
 public class DynamicDataSourceConfig {
     @Primary
     @Bean("masterDataSource")

src/main/java/com/dsic/gj_erp/config/JapConfig.java

@@ -26,7 +26,7 @@ import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 
-@Configuration
+//@Configuration
 @EnableJpaRepositories(
         basePackages = "com.dsic.gj_erp",
         entityManagerFactoryRef = "manEntityManagerFactory",

src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java

@@ -19,7 +19,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import javax.sql.DataSource;
 
 @MapperScan(basePackages = {"com.dsic.gj_erp.jiuzhoumapper"}, sqlSessionTemplateRef = "jiuzhouSqlSessionTemplate")
-@Configuration
+//@Configuration
 public class MyBatisPlusConfigJiuZhou {
     @Bean("jiuzhouSqlSessionFactory")
     public SqlSessionFactory jiuzhouSqlSessionFactory(@Qualifier("jiuzhouDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception {

src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java

@@ -20,7 +20,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import javax.sql.DataSource;
 
 @MapperScan(basePackages = {"com.dsic.gj_erp.mapper"}, sqlSessionTemplateRef = "masterSqlSessionTemplate")
-@Configuration
+//@Configuration
 public class MyBatisPlusConfigMaster {
     @Primary
     @Bean("masterSqlSessionFactory")

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
@@ -13,6 +14,7 @@ import com.dsic.gj_erp.listeners.ExcelJhxfListener;
 import com.dsic.gj_erp.service.jcsj.EmGcrlService;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
+import com.dsic.gj_erp.service.jhgk.impl.IYdjhImportService;
 import com.dsic.gj_erp.service.jhgk.impl.YdjhImportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +39,8 @@ public class DmSygdMxController {
 
     @Autowired
     private YdjhImportService ydjhImportService;
+    @Autowired
+    private IYdjhImportService iydjhImportService;
 
     @Autowired
     private DmSygdMxService service;
@@ -51,6 +55,11 @@ public class DmSygdMxController {
         return new ResultBean<>(service.cgjhdhqk(map));
     }
 
+    @GetMapping("listByFileName")
+    public ResultBean<?> listByFileName(String fileName) {
+        return new ResultBean<>(ydjhImportService.listByFileName(fileName));
+    }
+
     @GetMapping("list")
     public ResultBean<?> list(String begin, String end) {
         return new ResultBean<>(ydjhImportService.list(begin, end));
@@ -122,6 +131,7 @@ public class DmSygdMxController {
         Map<String, List<EmSbcnp>> map = list.stream().filter(l -> Objects.nonNull(l.getTzbh())).collect(Collectors.groupingBy(EmSbcnp::getTzbh));
         return new ResultBean(map);
     }
+
     @RequestMapping("/sygdPC")
     @AuthFunction
     public ResultBean sygdPC() {
@@ -137,7 +147,6 @@ public class DmSygdMxController {
     }
 
 
-
     @RequestMapping("/tqSygd")
     @AuthFunction
     public ResultBean tqSygd(String from, String to) {
@@ -148,17 +157,19 @@ public class DmSygdMxController {
     @RequestMapping("/ydjhImport")
     @AuthFunction
     public ResultBean ydjhImport(@RequestParam("file") MultipartFile file, String isupload, HttpServletRequest req) throws IOException {
-
-
         ExcelJhxfListener objectListener = new ExcelJhxfListener();
         EasyExcel.read(file.getInputStream(), JhxfExcel.class, objectListener).sheet(0).headRowNumber(1).doRead();
         List<JhxfExcel> objList = objectListener.getObjectList();
 
-        ydjhImportService.handler(objList,req);
+        String fileName = file.getOriginalFilename();
-//        service.ydjhImport(objList);
+        fileName=StrUtil.removeSuffix(fileName, ".xls");
-        return  new ResultBean();
+        //ydjhImportService.handler(objList, fileName, req);
-
+        return new ResultBean(fileName);
+    }
 
+    @RequestMapping("/getFileNameList")
+    public ResultBean<?> getFileNameList(){
+        return new ResultBean<>(iydjhImportService.getFileNameList());
     }
 
 }

src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java

@@ -57,7 +57,7 @@ public class DmXbjhController {
     @ApiOperation(value = "批量保存")
     @PostMapping(value = "/save")
     public ResultBean save(@RequestBody JSONObject dmXbjhs) {
-        dmXbjhService.save(dmXbjhs);
+        //dmXbjhService.save(dmXbjhs);
         return new ResultBean();
     }
 

src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java

@@ -113,7 +113,8 @@ public class DmYdjhController {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
         List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
                 .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
-                .eq(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
+                .ge(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
+                        .lt("zt","61")
                 .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -250,10 +250,22 @@ public class ZyjhController {
             }
             YcldwInfo info = dto.getYcldwInfo();
             if ("PWFK".equals(dto.getZxZtName())){
-                if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){
+//                if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){
-                    ycldwInfoService.updatePw(info);
+//                    ycldwInfoService.updatePw(info);
-                    wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(info));
+//                    wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(info));
+//                }
+                list.forEach(item-> {
+                    YcldwInfo ycldwInfo = ycldwInfoService.getOne(Wrappers.<YcldwInfo>query()
+                            .select("top 1 *")
+                            .eq("ydid", item.getId())
+                    );
+                    try {
+                        ycldwInfoService.updatePw(ycldwInfo);
+                        wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(ycldwInfo));
+                    }catch (Exception e){
+                        wsHandler.sendPwComplete1((JSONObject) JSONObject.toJSON(item));
                     }
+                });
             }
 
             if ("HXFK".equals(dto.getZxZtName())){

src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java

@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.listeners;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
@@ -15,24 +16,31 @@ import java.util.Map;
  */
 public class ExcelJhxfListener extends AnalysisEventListener<JhxfExcel> {
 
-    private static final int BATCH_COUNT = 5;
+    private static final int BATCH_COUNT = 1000;
 
     List<JhxfExcel> objectList = new ArrayList<>();
     List<Object> headList = new ArrayList<>();
     private String sheetName;
 
-    List<JhxfExcel> datas = new ArrayList<JhxfExcel>();
+    List<JhxfExcel> datas = new ArrayList<>();
 
-    private String dcch;
+    private String dcch="";
-    private String dcpl;
+    private String dcpl="";
+    private int size = 0;
+    private String lastXh="";
 
     @Override
     public void invoke(JhxfExcel excelDemo, AnalysisContext analysisContext) {
-    	//每解析一行数据，就会调用该方法一次
+        if (size==1&&excelDemo.isAvailable()
-        //正常在这里调用数据处理得办法
+                &&!dcch.equals(excelDemo.getDcCh())
-
+                &&!dcpl.equals(excelDemo.getDcPl())
-        //一条数据添加到暂时存储的存储结构中
+        ){
-
+            JhxfExcel jhxfExcel = new JhxfExcel();
+            jhxfExcel.setDcCh(dcch);
+            jhxfExcel.setDcPl(dcpl);
+            datas.add(jhxfExcel);
+            size+=1;
+        }
 
         if(StringUtils.isBlank(excelDemo.getDcCh())){
             excelDemo.setDcCh(dcch);
@@ -44,41 +52,19 @@ public class ExcelJhxfListener extends AnalysisEventListener<JhxfExcel> {
         }else{
             dcpl=excelDemo.getDcPl();
         }
-            boolean a=false;
+        size+=1;
-        //  9个数量都为空  不导入
-//        if(StringUtils.isBlank(excelDemo.getBs1()) &&
-//            StringUtils.isBlank(excelDemo.getYklm())&&
-//            StringUtils.isBlank(excelDemo.getYksk())&&
-//            StringUtils.isBlank(excelDemo.getEklmbs())&&
-//            StringUtils.isBlank(excelDemo.getEksk())&&
-//            StringUtils.isBlank(excelDemo.getSksk())&&
-//            StringUtils.isBlank(excelDemo.getSkpt())&&
-//            StringUtils.isBlank(excelDemo.getFbbs())&&
-//            StringUtils.isBlank(excelDemo.getSkbs())
-//        ){
-//            a=true;
-//        }
-
-
-//        boolean b = ObjConvertUtils.checkObjAllFieldsIsNull(excelDemo);
-//        if(!b && !a){
-//            datas.add(excelDemo);
-//        }
         datas.add(excelDemo);
 
-
-
-
         // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
         if (datas.size() >= BATCH_COUNT) {
             saveData();
             // 存储完成清理 list
             datas.clear();
         }
+        if (size>1){
+            size=0;
+        }
     }
-
-
-
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmXbjhMapper.java

@@ -4,6 +4,8 @@ package com.dsic.gj_erp.mapper.jhgk;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -14,4 +16,5 @@ import com.dsic.gj_erp.bean.jhgk.DmXbjh;
  */
 public interface DmXbjhMapper extends BaseMapper<DmXbjh> {
 
+    List<DmXbjh> getList(String dcCh,String nf,String startTime,String endTime,String version);
 }

src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportMapper.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.jhgk.YdjhImport;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface YdjhImportMapper extends BaseMapper<YdjhImport> {
+
+    List<String> getFileNameList();
 }

src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java

@@ -24,7 +24,7 @@ public interface DmXbjhService extends IService<DmXbjh> {
 
     JSONObject upload(MultipartFile file) throws IOException;
 
-    void save(JSONObject dmXbjhs);
+    void save(JSONObject dmXbjhs,int version);
 
     void tj(List<DmXbjh> dmXbjhs);
 

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

@@ -225,6 +225,11 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                         &&dmYdjh.getTzbh().equals(item.getTzbh())
                 ){
                     dmYdjh.setId(dmYdjh.getId());
+                    //二跨T型材腹板默认四区切割,这里修正一下
+                    if (dmYdjh.getTzbh().contains("N2T")){
+                        dmYdjh.setZyq1("四区");
+                        dmYdjh.setZyq("FP4Q");
+                    }
 
                     this.updateYdjh(dmYdjh,item);
 

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

@@ -55,15 +55,20 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
         if (StringUtils.isNotEmpty(json.getString("Zt"))) {
             queryWrapper.eq("zt", json.getString("Zt"));
         }
-
+        String startTime=null;
+        String endTime=null;
         if (StringUtils.isNotEmpty(json.getString("nf"))) {
             String nf = json.getString("nf");
-            String startTime = nf.split("~")[0];
+            startTime = nf.split("~")[0];
-            String endTime = nf.split("~")[1];
+            endTime = nf.split("~")[1];
             queryWrapper.between("nf", startTime, endTime);
         }
         queryWrapper.orderByDesc("zl");
-        List<DmXbjh> dmTzjhs = dmXbjhMapper.selectList(queryWrapper);
+        String version=json.getString("version");
+        if (version!=null){
+            version=version.replace("v","");
+        }
+        List<DmXbjh> dmTzjhs = dmXbjhMapper.getList(json.getString("dcCh"), json.getString("nf"),startTime,endTime,version);
         Map<String, List<DmXbjh>> map = dmTzjhs.stream()
                 .collect(Collectors.groupingBy(DmXbjh::getDcCh));
 
@@ -151,8 +156,11 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
                     String[] s = name.split("_");
                     names.add(s[s.length - 1]);
                 }
-                String tmpVersion=names.stream().max(String::compareTo).get();
+
-                Optional.of(tmpVersion).ifPresent(item->{
+                names.stream()
+                        .filter(item -> item.contains(DateUtil.thisYear() + ""))
+                        .max(String::compareTo)
+                        .ifPresent(item -> {
                     String v = item.replace("v", "");
                     maxVersion.set(Integer.parseInt(v));
                 });
@@ -166,14 +174,14 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
             int version = maxVersion.incrementAndGet();
             File uploadFiles = new File(StrUtil.format("{}/{}_{}{}{}{}", xbjhPath, DateUtil.thisYear(), "v", version, StrUtil.DOT, type));
             file.transferTo(uploadFiles);
-            this.save(dmXbjhs);
+            this.save(dmXbjhs,version);
         }
         return dmXbjhs;
     }
 
     @Override
     @Transactional
-    public void save(JSONObject json) {
+    public void save(JSONObject json,int version) {
         List<DmXbjh> dmXbjhs = new ArrayList<>();
         for (String key : json.keySet()) {
             JSONArray jsonArray = json.getJSONArray(key);
@@ -181,11 +189,12 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
                 //  JSONObject dmxb=JSONObject.parseObject(object.toString());
                 DmXbjh dmXbjh = modelMapper.map(object, DmXbjh.class);
                 dmXbjh.setDcCh(key);
+                dmXbjh.setVersion(version);
                 dmXbjhs.add(dmXbjh);
-                this.remove(new QueryWrapper<DmXbjh>().eq("dc_ch", dmXbjh.getDcCh())
+//                this.remove(new QueryWrapper<DmXbjh>().eq("dc_ch", dmXbjh.getDcCh())
-                        .eq("nf", dmXbjh.getNf())
+//                        .eq("nf", dmXbjh.getNf())
-                        .eq("yf", dmXbjh.getYf())
+//                        .eq("yf", dmXbjh.getYf())
-                );
+//                );
             }
         }
 

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

@@ -56,8 +56,8 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
     private PgdPwjhService pwService;
     @Autowired
     private PgdQgjhService qgService;
-    @Autowired
+//    @Autowired
-    private SljhService sljhService;
+//    private SljhService sljhService;
 
     @Override
     public List<DmSygdMx> tjydjh() {
@@ -310,7 +310,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
             baseMapper.tqlj(idList);
         }
 
-        publisher.publishEvent(ydjhList);
+//        publisher.publishEvent(ydjhList);
     }
 
     private DmYdjh ofXf(DmYdjh item,String gxsj){

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

@@ -5,6 +5,12 @@ import com.dsic.gj_erp.bean.jhgk.YdjhImport;
 import com.dsic.gj_erp.mapper.jhgk.YdjhImportMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class IYdjhImportService extends ServiceImpl<YdjhImportMapper, YdjhImport> {
+
+    public List<String> getFileNameList(){
+        return baseMapper.getFileNameList();
+    }
 }

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

@@ -6,21 +6,19 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmBom;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jhgk.*;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
-import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
-import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.pgd.PgdTzjhService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@@ -28,14 +26,22 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
-public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
+public class YdjhImportService {
 
     private final DmSygdxqMapper sygdxqMapper;
     private final IYdjhImportService importService;
     private final DmBomService bomService;
-    private final DmSygdMxLjService ljService;
     private final DmCbxxpService dmCbxxpService;
     private final PgdTzjhService tzjhService;
+    private final TransactionTemplate transactionTemplate;
+    private final DmSygdMxService sygdMxService;
+
+    public List<YdjhImport> listByFileName(String fileName) {
+        return importService.list(Wrappers.<YdjhImport>lambdaQuery()
+                .eq(StrUtil.isNotEmpty(fileName),YdjhImport::getFileName, fileName)
+                .orderByAsc(YdjhImport::getId)
+        );
+    }
 
     public List<YdjhImport> list(String begin, String end) {
         return importService.list(Wrappers.<YdjhImport>lambdaQuery()
@@ -44,11 +50,22 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         );
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    public void handler(List<JhxfExcel> objList,String fileName, HttpServletRequest request) {
-    public void handler(List<JhxfExcel> objList, HttpServletRequest request) {
         List<YdjhImport> ydjhImports = this.executeYdjhImport(objList);
 
-        ydjhImports.forEach(item->{
+        List<YdjhImport> list = ydjhImports.stream()
+//                .filter(YdjhImport::isAvailable)
+//                .filter(item -> !item.getDcPl().contains("-"))//去除T型材
+//                .filter(item -> !item.getDcPl().contains("/"))//去除T型材
+//                .filter(item -> !item.getDcPl().contains("Q"))
+                .filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
+                .collect(Collectors.toList());
+        List<DmSygdMx> sygdMxList = this.execute(list);
+
+        transactionTemplate.execute((status)->{
+            ydjhImports.stream().filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
+            .forEach(item->{
+                item.setFileName(fileName);
                 String dcPl=item.getDcPl();
                 if (item.getDcPl().contains("Q")) {
                     dcPl=item.getDcPl().replace("Q", "");
@@ -59,32 +76,18 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                 } catch (Exception ignored) {
                 }
 
-            baseMapper.delete(new QueryWrapper<DmSygdMx>()
+                importService.remove(new QueryWrapper<YdjhImport>()
+                        .eq("dc_ch", item.getDcCh())
+                        .eq("dc_pl", item.getDcPl())
+                );
+
+                sygdMxService.remove(new QueryWrapper<DmSygdMx>()
                         .eq("dc_ch", item.getDcCh())
                         .eq("dc_pl", dcPl)
                 );
-//            ljService.remove(new QueryWrapper<DmSygdMxLj>()
-//                    .eq("dcch", item.getDcCh())
-//                    .eq("pl", dcPl)
-//            );
             });
-        List<YdjhImport> qwb = ydjhImports.stream()
+            sygdMxService.saveBatch(sygdMxList);
-                .filter(YdjhImport::isAvailable)
+            ydjhImports.forEach(importService::save);
-                .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)
-                .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(list);
-
-        ydjhImports.forEach(importService::saveOrUpdate);
 
             //没有基础数据的计划生成图纸计划
             String yhms= (String) request.getAttribute("yhms");
@@ -94,6 +97,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
             HashMap<String, YdjhImport> map = new HashMap<>();
             ydjhImports.stream()
                     .filter(item -> !StrUtil.equals(item.getExtData(), "1")||item.getExtData()!=null)
+                    .filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
                     .forEach(item->{
                         YdjhImport ydjhImport = map.get(item.getDcCh() + item.getDcPl());
                         if (ydjhImport==null){
@@ -126,40 +130,17 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         }
                     });
             tzjhService.saveBatch(tzjhList);
+            return true;
+        });
 
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public List<YdjhImport> executeYdjhImport(List<JhxfExcel> objList) {
-        Map<String, YdjhImport> map = new HashMap<>();
         List<YdjhImport> list = new ArrayList<>();
-        for (int i = 0; i < objList.size(); i++) {
+        for (JhxfExcel item : objList) {
-            JhxfExcel item = objList.get(i);
             YdjhImport jh = new YdjhImport();
             BeanUtil.copyProperties(item, jh);
-            jh.setImportIndex(i);
-            YdjhImport _jh = map.get(jh.getDcCh() + jh.getDcPl());
-            if (_jh != null) {
-                if (_jh.getFdxq() != null && jh.getFdxq() == null) {
-                    jh.setFdxq(_jh.getFdxq());
-                }
-                if (_jh.getFdxq() == null && jh.getFdxq() != null) {
-                    _jh.setFdxq(jh.getFdxq());
-                }
-                if (_jh.getQwbjs() != null && jh.getQwbjs() == null) {
-                    jh.setQwbjs(_jh.getQwbjs());
-                }
-                if (_jh.getQwbjs() == null && jh.getQwbjs() != null) {
-                    _jh.setQwbjs(jh.getQwbjs());
-                }
-            } else {
-                map.put(jh.getDcCh() + jh.getDcPl(), jh);
-            }
 
-            importService.remove(new QueryWrapper<YdjhImport>()
-                    .eq("dc_ch", jh.getDcCh())
-                    .eq("dc_pl", jh.getDcPl())
-            );
             jh.setZt("0");
             list.add(jh);
         }
@@ -169,24 +150,34 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
     /**
      * 月度计划导入,不使用月度计划只能排产功能前提下使用该功能导入月度计划
      */
-    @Transactional(rollbackFor = Exception.class)
+    public List<DmSygdMx> execute(List<YdjhImport> objList) {
-    public void execute(List<YdjhImport> objList) {
         HashMap<String, Object> _map = new HashMap<>();
         List<DmSygdMx> addList = new ArrayList<>();
         objList.forEach(item->{
-            String dcPl=item.getDcPl();
+            String _dcPl=item.getDcPl();
-            if (item.getDcPl().contains("Q")) {
+            List<String> plList=new ArrayList<>();
-                dcPl=item.getDcPl().replace("Q", "");
+            if (_dcPl.contains("Q")) {
+                plList.add(item.getDcPl().replace("Q", ""));
                 item.setQwbBs(true);
+            }else if(_dcPl.contains("-")||_dcPl.contains("/")){
+                String[] split = _dcPl.split("/");
+                for (String s : split) {
+                    String[] split1 = s.split("-");
+                    if (split1.length == 1) {
+                        plList.add(split1[0]);
+                    } else {
+                        for (int j = Integer.parseInt(split1[0]); j <= Integer.parseInt(split1[1].replace("D","")); j++) {
+                            plList.add(j + "");
+                        }
+                    }
+                }
             }
 
+            for (String dcPl : plList) {
                 try {
                     dcPl = String.format("%03d", Integer.parseInt(dcPl));
                 } catch (Exception ignored) {
                 }
-            String[] dcfd=item.getDcFd().split("\\.");
-
-            String dcFd=dcfd[0];
 
                 Object o = _map.get(item.getDcCh() + item.getDcPl());
                 if(o==null){
@@ -211,16 +202,16 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         item.setExtData(dcCh);//使用目标船只基础数据
                         bomList = bomService.getBomWithYlbs(dcCh, dcPl);
                         if (ObjUtil.isEmpty(bomList)) {
-                        DmSygdMx dmSygdMx = this.initDefault(item,dcFd,dcPl);
+                            DmSygdMx dmSygdMx = this.initDefault(item,dcPl);
                             dmSygdMx.setDcCh1(dcCh);
-                        this.save(dmSygdMx);
+
                             item.setExtData("0");//无基础数据
                             return;
                         }
                     } else {
                         item.setExtData("0");//无基础数据
-                    DmSygdMx dmSygdMx = this.initDefault(item,dcFd,dcPl);
+                        DmSygdMx dmSygdMx = this.initDefault(item,dcPl);
-                    this.save(dmSygdMx);
+                        addList.add(dmSygdMx);
                         return;
                     }
                 } else {
@@ -244,18 +235,19 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                 }
                 List<DmSygdMxLj> ljList = this.initLj(item.getDcCh(), map, bomList);
 
-            List<DmSygdMx> sygdMxes;
+                List<DmSygdMx> sygdMxes=new ArrayList<>();
+                if (StrUtil.isNotEmpty(item.getSl())){
                     if (item.getQwbBs()) {
                         ljList=ljList.stream().filter(it -> "3".equals(it.getTzbh().substring(5, 6)))
                                 .collect(Collectors.toList());
-                sygdMxes = this.initBySl(item, ljList,dcFd);
                     } else {
                         ljList=ljList.stream().filter(it -> !"3".equals(it.getTzbh().substring(5, 6)))
                                 .collect(Collectors.toList());
-                sygdMxes = this.initBySl(item, ljList,dcFd);
                     }
-
+                    sygdMxes = this.initBySl(item, ljList);
+                    item.setBs1(sygdMxes.size()+"");
                     addList.addAll(sygdMxes);
+                }
 
                 if (item.getPkqgjs() != null) {
                     List<DmSygdMx> _sygdMxes = sygdMxes.stream().filter(it -> "7".equals(it.getKw())).collect(Collectors.toList());
@@ -263,36 +255,47 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateByYklm(item, sygdMx);
                         }
+                        item.setYklm(_sygdMxes.size()+"");
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "7".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initByYklm(item, _ljlist,dcFd,dcPl);
+                        if (!_ljlist.isEmpty()){
+                            List<DmSygdMx> list = this.initByYklm(item, _ljlist);
+                            addList.addAll(list);
+                            item.setYklm(list.size()+"");
+                        }
+
+                    }
+
+                    List<DmSygdMx> _sygdMxes1 = sygdMxes.stream().filter(it -> "8".equals(it.getKw())).collect(Collectors.toList());
+                    if (!_sygdMxes1.isEmpty()) {
+                        for (DmSygdMx dmSygdMx : _sygdMxes1) {
+                            this.updateByYksk(item, dmSygdMx);
+                        }
+                        item.setYksk(_sygdMxes1.size()+"");
+                    } else {
+                        List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "8".equals(it.getKw())).collect(Collectors.toList());
+                        if (!_ljlist.isEmpty()) {
+                            List<DmSygdMx> list = this.initByYksk(item, _ljlist);
                             addList.addAll(list);
+                            item.setYksk(list.size()+"");
+                        }
+                    }
                 }
 
-//                List<DmSygdMx> _sygdMxes1 = sygdMxes.stream().filter(it -> "8".equals(it.getKw())).collect(Collectors.toList());
-//                if (!_sygdMxes1.isEmpty()) {
-//                    for (DmSygdMx dmSygdMx : _sygdMxes1) {
-//                        this.updateByYksk(item, dmSygdMx);
-//                    }
-//                } else {
-//                    List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "8".equals(it.getKw())).collect(Collectors.toList());
-//                    if (!_ljlist.isEmpty()) {
-//                        List<DmSygdMx> list = this.initByYksk(item, _ljlist,dcFd,dcPl);
-//                        addList.addAll(list);
-//                    }
-//                }
-            }
-//
                 if (item.getLmqgks() != null) {
                     List<DmSygdMx> _sygdMxes = sygdMxes.stream().filter(it -> "5".equals(it.getKw())).collect(Collectors.toList());
                     if (!_sygdMxes.isEmpty()) {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateByEklm(item, sygdMx);
                         }
+                        item.setEklmbs(_sygdMxes.size()+"");
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "5".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initByEklmbs(item, _ljlist,dcFd,dcPl);
+                        if (!_ljlist.isEmpty()){
+                            List<DmSygdMx> list = this.initByEklmbs(item, _ljlist);
                             addList.addAll(list);
+                            item.setEklmbs(list.size()+"");
+                        }
                     }
                 }
 
@@ -302,10 +305,14 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateByEksk(item, sygdMx);
                         }
+                        item.setEksk(_sygdMxes.size()+"");
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "9".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initByEksk(item, _ljlist,dcFd,dcPl);
+                        if (!_ljlist.isEmpty()) {
+                            List<DmSygdMx> list = this.initByEksk(item, _ljlist);
                             addList.addAll(list);
+                            item.setEksk(list.size()+"");
+                        }
                     }
                 }
 
@@ -315,10 +322,14 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateBySksk(item, sygdMx);
                         }
+                        item.setSksk(_sygdMxes.size()+"");
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "14".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initBySksk(item, _ljlist,dcFd,dcPl);
+                        if (!_ljlist.isEmpty()) {
+                            List<DmSygdMx> list = this.initBySksk(item, _ljlist);
                             addList.addAll(list);
+                            item.setSksk(list.size()+"");
+                        }
                     }
                 }
 
@@ -328,10 +339,14 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateBySkpt(item, sygdMx);
                         }
+                        item.setSkpt(_sygdMxes.size()+"");
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "6".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initBySkpt(item, _ljlist,dcFd,dcPl);
+                        if(!_ljlist.isEmpty()){
+                            List<DmSygdMx> list = this.initBySkpt(item, _ljlist);
                             addList.addAll(list);
+                            item.setSkpt(list.size()+"");
+                        }
                     }
                 }
 
@@ -341,19 +356,40 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
                         for (DmSygdMx sygdMx : _sygdMxes) {
                             this.updateBySkbs(item, sygdMx);
                         }
+                        if ("T型材".equals(item.getDcFd())&&"Z".equals(item.getZl())){
+                            long count = _sygdMxes.stream().filter(it -> it.getZl().equals("1110")).count();
+                            item.setSkbs(count+"");
+                        }else if("机器人肘板".equals(item.getDcFd())&&"X".equals(item.getZl())){
+                            long count = _sygdMxes.stream().filter(it -> it.getZl().equals("1010")).count();
+                            item.setSkbs(count+"");
+                        }else {
+                            item.setSkbs(_sygdMxes.size()+"");
+                        }
                     } else {
                         List<DmSygdMxLj> _ljlist = ljList.stream().filter(it -> "15".equals(it.getKw())).collect(Collectors.toList());
-                    List<DmSygdMx> list = this.initBySkbs(item, _ljlist,dcFd,dcPl);
+                        if (_ljlist.isEmpty()){
+                            List<DmSygdMx> list = this.initBySkbs(item, _ljlist);
                             addList.addAll(list);
+                            if ("T型材".equals(item.getDcFd())&&"Z".equals(item.getZl())){
+                                long count = _ljlist.stream().filter(it -> it.getZl().equals("1110")).count();
+                                item.setSkbs(count+"");
+                            }else if("机器人肘板".equals(item.getDcFd())&&"X".equals(item.getZl())){
+                                long count = _ljlist.stream().filter(it -> it.getZl().equals("1010")).count();
+                                item.setSkbs(count+"");
+                            }else {
+                                item.setSkbs(_ljlist.size()+"");
+                            }
+                        }
+                    }
                 }
             }
-//            ljService.saveBatch(ljList);
         });
 
-        this.saveBatch(addList);
+//        this.saveBatch(addList);
+        return addList;
     }
 
-    private List<DmSygdMx> initBySl(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd) {
+    private List<DmSygdMx> initBySl(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
 
         if (item.getSl() != null) {
@@ -373,7 +409,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initByYklm(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initByYklm(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -391,7 +427,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initByYksk(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initByYksk(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -409,7 +445,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initByEklmbs(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initByEklmbs(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -427,7 +463,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initByEksk(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initByEksk(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -445,7 +481,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initBySksk(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initBySksk(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -463,7 +499,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initBySkpt(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initBySkpt(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -481,7 +517,7 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         return addList;
     }
 
-    private List<DmSygdMx> initBySkbs(YdjhImport item, List<DmSygdMxLj> bomList,String dcFd,String dcPl) {
+    private List<DmSygdMx> initBySkbs(YdjhImport item, List<DmSygdMxLj> bomList) {
         List<DmSygdMx> addList = new ArrayList<>();
         ArrayList<DmSygdMxLj> list = bomList.stream().collect(
                 Collectors.collectingAndThen(
@@ -542,14 +578,13 @@ public class YdjhImportService extends ServiceImpl<DmSygdMxMapper, DmSygdMx> {
         dmSygdMx.setQgrq(item.getSkqgks());
     }
 
-    private DmSygdMx initDefault(YdjhImport item,String dcFd,String dcPl) {
+    private DmSygdMx initDefault(YdjhImport item,String dcPl) {
         DmSygdMx dmSygdMx = new DmSygdMx();
         dmSygdMx.setDcCh(item.getDcCh());
         if(!"1".equals(item.getExtData())){
             dmSygdMx.setDcCh1(item.getExtData());
         }
         dmSygdMx.setDcPl(dcPl);
-        dmSygdMx.setDcFd(dcFd);
         dmSygdMx.setJssj(item.getFdxq());
         dmSygdMx.setSlrq(item.getSl());
         dmSygdMx.setXcpw(item.getXcpw());

src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
-@Service
+//@Service
 public class SljhService extends ServiceImpl<SljhMapper, Sljh> {
 
     @Async

src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java

@@ -29,7 +29,7 @@ public class YcldwInfoService extends ServiceImpl<YcldwInfoMapper, YcldwInfo> {
     @Transactional(rollbackOn = Exception.class)
     public void updatePw(YcldwInfo info){
         this.removeById(info.getId());
-        baseMapper.pwfk(info.getCeng(),info.getDwId());
+//        baseMapper.pwfk(info.getCeng(),info.getDwId());
     }
 
     @Transactional(rollbackOn = Exception.class)

src/main/java/com/dsic/gj_erp/ws/WsHandler.java

@@ -54,6 +54,10 @@ public class WsHandler {
         socketIOServer.getBroadcastOperations().sendEvent("slComplete", object);
     }
 
+    public void sendPwComplete1(JSONObject object) {
+        socketIOServer.getBroadcastOperations().sendEvent("pwComplete1", object);
+    }
+
     public void sendPwComplete(JSONObject object) {
         socketIOServer.getBroadcastOperations().sendEvent("pwComplete", object);
     }

src/main/resources/application.properties

@@ -20,24 +20,28 @@ spring.servlet.multipart.max-request-size=500MB
 spring.servlet.multipart.enabled = true
 
 server.port=8081
-
+spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.datasource.url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP
-spring.datasource.master.url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP
+spring.datasource.username=sa
-spring.datasource.master.jdbc-url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP
+spring.datasource.password=gjerp
-spring.datasource.master.username=sa
+
-spring.datasource.master.password=gjerp
+#spring.datasource.master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.master.initialize=true
+#spring.datasource.master.url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP
-
+#spring.datasource.master.jdbc-url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP
-spring.datasource.jiuzhou.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.master.username=sa
-spring.datasource.jiuzhou.jdbc-url=jdbc:mysql://192.168.3.12:3306/jiuzhou?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+#spring.datasource.master.password=gjerp
-spring.datasource.jiuzhou.username=root
+#spring.datasource.master.initialize=true
-spring.datasource.jiuzhou.password=gjerp
+#
-spring.datasource.jiuzhou.initialize=true
+#spring.datasource.jiuzhou.driver-class-name=com.mysql.cj.jdbc.Driver
-
+#spring.datasource.jiuzhou.jdbc-url=jdbc:mysql://192.168.3.12:3306/jiuzhou?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-hibernate.naming.physical_strategy=com.dsic.gj_erp.config.MyPhysicalNamingStrategy
+#spring.datasource.jiuzhou.username=root
-hibernate.show_sql=true
+#spring.datasource.jiuzhou.password=gjerp
-hibernate.connection.autocommit=true
+#spring.datasource.jiuzhou.initialize=true
-hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect
+#
+#hibernate.naming.physical_strategy=com.dsic.gj_erp.config.MyPhysicalNamingStrategy
+#hibernate.show_sql=true
+#hibernate.connection.autocommit=true
+#hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect
 
 mybatis-plus.configuration.batch-size=5000
 

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

@@ -33,4 +33,21 @@
         <result column="cl_202312" property="cl202312" />
     </resultMap>
 
+    <select id="getList" resultType="com.dsic.gj_erp.bean.jhgk.DmXbjh">
+        SELECT a.*
+        FROM dm_xbjh a --left join DM_CBXXP b on a.dc_ch =b.CBBM
+        WHERE
+            b.wgbs ='N'
+            <if test="version!=null and version!=''">
+                and version=#{version}
+            </if>
+            <if test="dcCh!=null and dcCh!=''">
+                and dc_ch=#{dcCh}
+            </if>
+            <if test="nf!=null and nf!=''">
+                and nf BETWEEN #{startTime} AND #{endTime}
+            </if>
+        ORDER BY zl DESC
+    </select>
+
 </mapper>

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

@@ -3,4 +3,7 @@
 <mapper namespace="com.dsic.gj_erp.mapper.jhgk.YdjhImportMapper">
 
 
+    <select id="getFileNameList" resultType="java.lang.String">
+        SELECT distinct file_name  from ydjh_import WHERE isnull(file_name,'')!=''
+    </select>
 </mapper>