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 030b533..8bf1a6b 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.zyjh.DmYlInfo; import com.dsic.gj_erp.exception.ServiceException; +import com.google.common.collect.ImmutableList; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -15,6 +16,9 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** *

@@ -423,6 +427,40 @@ public class DmYdjh implements Serializable { return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh); } + @TableField(exist = false) + private static final List FP2Q = ImmutableList.of("1","13","14","3","7","8"); + @TableField(exist = false) + private static final List FP3Q = ImmutableList.of("6","10","12","2","5","9"); + @TableField(exist = false) + private static final List FP4Q = ImmutableList.of("11","4","15"); + @TableField(exist = false) + private static final Map> zyqKwMap=new HashMap>(){{ + put("FP2Q",FP2Q); + put("FP3Q",FP3Q); + put("FP4Q",FP4Q); + }}; + + public void updateZyq(){ + if (this.kw==null){ + return; + } + + if (FP2Q.contains(this.kw)){ + this.setZyq("FP2Q"); + this.setZyq1("二区"); + } + + if (FP3Q.contains(this.kw)){ + this.setZyq("FP3Q"); + this.setZyq1("三区"); + } + + if (FP4Q.contains(this.kw)){ + this.setZyq("FP4Q"); + this.setZyq1("四区"); + } + } + public DmYdjh ofPrintForSl(DmYlInfo item,String date){ DmYdjh dmYdjh = new DmYdjh(); dmYdjh.setId(this.id); diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index 1b80c5f..2b9d6c6 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -128,42 +128,42 @@ public class PgdSljhController { ydjh.setZylx(slKc.getZYLX()); ydjh.setSlbz(slKc.getBZ()); ydjh.setSldrry((String) req.getAttribute("yhms")); - if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) - || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) - ){ - ydjh.setZyq("FP2Q"); - ydjh.setZyq1("二区"); - - ydjh.setKw(slKc.getSLDW()); - } - if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) - || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) - ){ - ydjh.setZyq("FP3Q"); - ydjh.setZyq1("三区"); - - ydjh.setKw(slKc.getSLDW()); - - //作业区默认值修正 - //二跨T型材腹板对应四区 - //二跨T型材面板对应三区 上面已处理 这里只做记录 - if("11".equals(slKc.getSLDW())){ - ydjh.setZyq("FP4Q"); - ydjh.setZyq1("四区"); - } - } - - if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) - ){ - ydjh.setZyq("FP4Q"); - ydjh.setZyq1("四区"); - - ydjh.setKw(slKc.getSLDW()); - } - if("11".equals(slKc.getSLDW())) { - ydjh.setZyq("FP4Q"); - ydjh.setZyq1("四区"); - } +// if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) +// || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) +// ){ +// ydjh.setZyq("FP2Q"); +// ydjh.setZyq1("二区"); +// +// ydjh.setKw(slKc.getSLDW()); +// } +// if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) +// || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) +// ){ +// ydjh.setZyq("FP3Q"); +// ydjh.setZyq1("三区"); +// +// ydjh.setKw(slKc.getSLDW()); +// +// //作业区默认值修正 +// //二跨T型材腹板对应四区 +// //二跨T型材面板对应三区 上面已处理 这里只做记录 +// if("11".equals(slKc.getSLDW())){ +// ydjh.setZyq("FP4Q"); +// ydjh.setZyq1("四区"); +// } +// } +// +// if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) +// ){ +// ydjh.setZyq("FP4Q"); +// ydjh.setZyq1("四区"); +// +// ydjh.setKw(slKc.getSLDW()); +// } +// if("11".equals(slKc.getSLDW())) { +// ydjh.setZyq("FP4Q"); +// ydjh.setZyq1("四区"); +// } ydupList.add(ydjh); } if(StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH()) ){ @@ -192,7 +192,6 @@ public class PgdSljhController { ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); ydjh.setSldrry((String) req.getAttribute("yhms")); - if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) ){ @@ -229,7 +228,13 @@ public class PgdSljhController { ydjh.setZyq("FP4Q"); ydjh.setZyq1("四区"); } - dmYdjhService.save(ydjh); + + //20251212 傅春晓 三跨平铁默认三区施工 + if("6".equals(slKc.getSLDW())) { + ydjh.setZyq("FP3Q"); + ydjh.setZyq1("三区"); + } + dmYdjhService.save(ydjh); } } @@ -668,10 +673,10 @@ public class PgdSljhController { //作业区默认值修正 //二跨T型材腹板对应四区 - if("11".equals(slKc.getSLDW())){ - dmYdjh.setZyq("FP4Q"); - dmYdjh.setZyq1("四区"); - } +// if("11".equals(slKc.getSLDW())){ +// dmYdjh.setZyq("FP4Q"); +// dmYdjh.setZyq1("四区"); +// } ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 ups.add(dmYdjh); } @@ -689,43 +694,43 @@ public class PgdSljhController { dmYdjh.setId(slKc.getYdid()); - DmYdjh byId = dmYdjhService.getById(slKc.getYdid()); - if(!byId.getKw().equals(slKc.getSLDW())){ - // 修改跨位 // 修改作业区 - - if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) - || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) - ){ - dmYdjh.setZyq("FP2Q"); - dmYdjh.setZyq1("二区"); - dmYdjh.setYkw(byId.getKw()); - dmYdjh.setKw(slKc.getSLDW()); - } - if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) - || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) - ){ - dmYdjh.setZyq("FP3Q"); - dmYdjh.setZyq1("三区"); - dmYdjh.setYkw(byId.getKw()); - dmYdjh.setKw(slKc.getSLDW()); - - //作业区默认值修正 - //二跨T型材腹板对应四区 - //二跨T型材面板对应三区 上面已处理 这里只做记录 - if("11".equals(slKc.getSLDW())){ - dmYdjh.setZyq("FP4Q"); - dmYdjh.setZyq1("四区"); - } - } - - if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) - ){ - dmYdjh.setZyq("FP4Q"); - dmYdjh.setZyq1("四区"); - dmYdjh.setYkw(byId.getKw()); - dmYdjh.setKw(slKc.getSLDW()); - } - } +// DmYdjh byId = dmYdjhService.getById(slKc.getYdid()); +// if(!byId.getKw().equals(slKc.getSLDW())){ +// // 修改跨位 // 修改作业区 +// +// if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) +// || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) +// ){ +// dmYdjh.setZyq("FP2Q"); +// dmYdjh.setZyq1("二区"); +// dmYdjh.setYkw(byId.getKw()); +// dmYdjh.setKw(slKc.getSLDW()); +// } +// if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) +// || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) +// ){ +// dmYdjh.setZyq("FP3Q"); +// dmYdjh.setZyq1("三区"); +// dmYdjh.setYkw(byId.getKw()); +// dmYdjh.setKw(slKc.getSLDW()); +// +// //作业区默认值修正 +// //二跨T型材腹板对应四区 +// //二跨T型材面板对应三区 上面已处理 这里只做记录 +// if("11".equals(slKc.getSLDW())){ +// dmYdjh.setZyq("FP4Q"); +// dmYdjh.setZyq1("四区"); +// } +// } +// +// if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) +// ){ +// dmYdjh.setZyq("FP4Q"); +// dmYdjh.setZyq1("四区"); +// dmYdjh.setYkw(byId.getKw()); +// dmYdjh.setKw(slKc.getSLDW()); +// } +// } ups.add(dmYdjh); } ups1.add(imCkwpkwp); diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index 9038797..01d932d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.service.jcsj.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -98,49 +97,49 @@ public class BomUploadServiceImpl { @Autowired DmYdjhService dmYdjhService; - public void updateYdjhYlUseInfo(MultipartFile[] file,String dcCh,String dcPl){ + public void updateYdjhYlUseInfo(MultipartFile[] file, String dcCh, String dcPl) { try { - String p=".*用板统计表.*[.xlsx?|.xls?]$"; + String p = ".*用板统计表.*[.xlsx?|.xls?]$"; Pattern r = Pattern.compile(p); Arrays.stream(file) .filter(item -> { - if(item.getOriginalFilename()!=null){ + if (item.getOriginalFilename() != null) { Matcher m = r.matcher(item.getOriginalFilename()); return m.matches(); } return false; - }).forEach(item->{ - if(StrUtil.isNotEmpty(item.getOriginalFilename())){ - String tzbh=""; + }).forEach(item -> { + if (StrUtil.isNotEmpty(item.getOriginalFilename())) { + String tzbh = ""; try { List lines = ExcelUtil.ReadExcelByLine(item.getInputStream(), item.getOriginalFilename()); - boolean handlerFlag=false; + boolean handlerFlag = false; for (int i = 1; i < lines.size(); i++) { - String lastLine=lines.get(i-1); - if (StrUtil.containsAll(lastLine,"船号","批量")){ - handlerFlag=false; + String lastLine = lines.get(i - 1); + if (StrUtil.containsAll(lastLine, "船号", "批量")) { + handlerFlag = false; } - String line=lines.get(i); - if (StrUtil.containsAll(line,"船研所船体室套料科","打印时间")){ - handlerFlag=false; + String line = lines.get(i); + if (StrUtil.containsAll(line, "船研所船体室套料科", "打印时间")) { + handlerFlag = false; } - if (StrUtil.containsAll(lastLine,"余料编号","余料规格","调用信息","转出信息")){ - handlerFlag=true; + if (StrUtil.containsAll(lastLine, "余料编号", "余料规格", "调用信息", "转出信息")) { + handlerFlag = true; } - if (handlerFlag){ + if (handlerFlag) { String[] split = line.split(" "); - if (StrUtil.isAllEmpty(split)){ + if (StrUtil.isAllEmpty(split)) { continue; } - if (split.length<=8){ + if (split.length <= 8) { continue; } - tzbh=split[8]; - if (StrUtil.isEmpty(tzbh)){ + tzbh = split[8]; + if (StrUtil.isEmpty(tzbh)) { continue; } - dmYdjhService.update(Wrappers.update().set("jhsyylbh",tzbh) + dmYdjhService.update(Wrappers.update().set("jhsyylbh", tzbh) .eq("dc_ch", dcCh) .eq("dc_pl", dcPl) .eq("tzbh", split[1]) @@ -148,17 +147,17 @@ public class BomUploadServiceImpl { } } } catch (IOException e) { - log.info("修正余料计划调用信息失败,船号:{},批次:{},图号:{}",dcCh,dcPl,tzbh); + log.info("修正余料计划调用信息失败,船号:{},批次:{},图号:{}", dcCh, dcPl, tzbh); } } }); - }catch (Exception e) { - log.info("修正余料计划调用信息失败,船号:{},批次:{}",dcCh,dcPl); + } catch (Exception e) { + log.info("修正余料计划调用信息失败,船号:{},批次:{}", dcCh, dcPl); } } @Transactional(rollbackFor = Exception.class) - public ResultBean uploadZ(MultipartFile[] file, String czbh, String pl, String isupload, HttpServletRequest req,String path) throws IOException, CustomException, ScriptException { + public ResultBean uploadZ(MultipartFile[] file, String czbh, String pl, String isupload, HttpServletRequest req, String path) throws IOException, CustomException, ScriptException { String savePath = UUID.randomUUID().toString().replace("-", ""); //dezt="00"; File destFile = null; @@ -171,26 +170,23 @@ public class BomUploadServiceImpl { int ldpt = 1; String czbh1 = ""; String pl1 = ""; - // + // - List oloList = dmBomService.list(new QueryWrapper().eq("dcch", czbh) + List oloList = dmBomService.list(new QueryWrapper().eq("dcch", czbh) .eq("pl", pl) - ); - Boolean delfag=false; - for(DmBom e:oloList){ - if("Y".equals(e.getFkgs())){ - delfag=true; - break; - } - } - - - if (delfag) { - throw new CustomException(10106,"不能重新导入请联系管理员"); + ); + Boolean delfag = false; + for (DmBom e : oloList) { + if ("Y".equals(e.getFkgs())) { + delfag = true; + break; } + } - + if (delfag) { + throw new CustomException(10106, "不能重新导入请联系管理员"); + } // List list = dmBomService.list(new QueryWrapper().eq("sjch", czbh) @@ -202,7 +198,7 @@ public class BomUploadServiceImpl { // 判断是否导入过 if (isupload.equals("01")) { List bclqmxpListOld = bclqjbpService.list(new QueryWrapper().eq("DC_CH", czbh) - .eq("DC_PL", pl) + .eq("DC_PL", pl) ); if (bclqmxpListOld.size() > 0) { Map map = new HashMap(); @@ -211,12 +207,12 @@ public class BomUploadServiceImpl { } } else { } - File folder = new File("/"+czbh+"/"+pl); + File folder = new File("/" + czbh + "/" + pl); // Check if the directory exists if (folder.exists()) { // Delete the directory and its contents - MyFileUtil.deleteDirectory(folder); + MyFileUtil.deleteDirectory(folder); } boolean fbom = false; Integer cs = null; @@ -228,8 +224,8 @@ public class BomUploadServiceImpl { Arrays.sort(file, (f1, f2) -> { String name1 = f1.getOriginalFilename(); String name2 = f2.getOriginalFilename(); - boolean containsKeyword1 = name1.contains("套料图") ; - boolean containsKeyword2 = name2.contains("套料图") ; + boolean containsKeyword1 = name1.contains("套料图"); + boolean containsKeyword2 = name2.contains("套料图"); // 如果一个包含“套料图”，另一个不包含，则优先不包含的文件 if (containsKeyword1 && !containsKeyword2) { @@ -245,7 +241,7 @@ public class BomUploadServiceImpl { for (MultipartFile file1 : file) { System.out.println(file1.getOriginalFilename()); } - String ydf=""; + String ydf = ""; for (MultipartFile f : file) { String fname = f.getOriginalFilename(); @@ -269,7 +265,7 @@ public class BomUploadServiceImpl { int indexOfSecondUnderscore = fname.lastIndexOf('_'); pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); - Map map = this.bclqbUpload(lines, fname, req, isupload, bcdel,f, path); + Map map = this.bclqbUpload(lines, fname, req, isupload, bcdel, f, path); bcdel++; if (map.get("zt").equals("02")) { return new ResultBean(map); @@ -281,7 +277,7 @@ public class BomUploadServiceImpl { // 2. 第一个_后面批前面的字符 int indexOfSecondUnderscore = fname.lastIndexOf('_'); pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); - Map map = this.xclqbUpload(lines, fname, req, isupload, xcdel,f, path); + Map map = this.xclqbUpload(lines, fname, req, isupload, xcdel, f, path); xcdel++; if (map.get("zt").equals("02")) { return new ResultBean(map); @@ -293,7 +289,7 @@ public class BomUploadServiceImpl { // 2. 第一个_后面批前面的字符 int indexOfSecondUnderscore = fname.lastIndexOf('_'); pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); - Map map = this.bctjUpload(lines, fname, req, isupload, bctjdel,f, path); + Map map = this.bctjUpload(lines, fname, req, isupload, bctjdel, f, path); bctjdel++; if (map.get("zt").equals("02")) { return new ResultBean(map); @@ -305,20 +301,20 @@ public class BomUploadServiceImpl { // 2. 第一个_后面批前面的字符 int indexOfSecondUnderscore = fname.lastIndexOf('_'); pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); - Map map = this.xctjUpload(lines, fname, req, isupload, xctjdel,f, path); + Map map = this.xctjUpload(lines, fname, req, isupload, xctjdel, f, path); xctjdel++; if (map.get("zt").equals("02")) { return new ResultBean(map); } } - if (fname.contains("套料图") && (!fname.contains(".pdf") && !fname.contains(".PDF")) ) { + if (fname.contains("套料图") && (!fname.contains(".pdf") && !fname.contains(".PDF"))) { int indexOfUnderscore = fname.indexOf('_'); czbh1 = fname.substring(0, indexOfUnderscore); // 2. 第一个_后面批前面的字符 int indexOfSecondUnderscore = fname.lastIndexOf('_'); pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('套')); - Map map = this.bctltUpload(lines, fname, req, isupload, tld,f, path); - ydf=(String) map.get("yd"); + Map map = this.bctltUpload(lines, fname, req, isupload, tld, f, path); + ydf = (String) map.get("yd"); tld++; if (map.get("zt").equals("02")) { return new ResultBean(map); @@ -336,7 +332,7 @@ public class BomUploadServiceImpl { } } - Map map = this.ljptbUpload(lines, fname, req, isupload, ldpt,f, path); + Map map = this.ljptbUpload(lines, fname, req, isupload, ldpt, f, path); ldpt++; if (map.get("zt").equals("02")) { return new ResultBean(map); @@ -345,13 +341,13 @@ public class BomUploadServiceImpl { // del++; } - if("".equals(ydf)){ - this.bomxzjhByDm_bchxylp(czbh,pl,req); + if ("".equals(ydf)) { + this.bomxzjhByDm_bchxylp(czbh, pl, req); } // 修正数据 - dmYdjhMapper.xzylbs(czbh,pl); - dmYdjhMapper.updatezyq(czbh,pl); + dmYdjhMapper.xzylbs(czbh, pl); + //dmYdjhMapper.updatezyq(czbh, pl); for (MultipartFile f : file) { String fname = f.getOriginalFilename(); fname = fname.substring(fname.lastIndexOf('/') + 1); @@ -387,7 +383,7 @@ public class BomUploadServiceImpl { * // 根据船号 ，pi量全部删除 型材是否 插入 物品基本表 */ @Transactional(rollbackFor = Exception.class) - public Map bclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int bcdel,MultipartFile file,String path) throws CustomException { + public Map bclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int bcdel, MultipartFile file, String path) throws CustomException { // 判断是否重复导入 Map map = new HashMap(); String id = syService.f_getpjh("DM", "SYSTEM", "CLDE"); @@ -443,7 +439,7 @@ public class BomUploadServiceImpl { // .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") // .eq("LQLB_z", bclqjbp.getLqlb()).eq("ZZCJ_z", bclqjbp.getZzcj())); List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) - .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") ); if (bclqmxpListOld.size() > 0 && "01".equals(zt) && bcdel == 1) { // 提示是否覆盖 @@ -457,10 +453,10 @@ public class BomUploadServiceImpl { // .eq("dc_zl", bclqjbp.getDcZl()).eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "B") // .eq("lqlb", bclqjbp.getLqlb()).eq("zzcj", bclqjbp.getZzcj())); bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()). - eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") + eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") ); bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) - .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "B") + .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "B") ); dezt = "01"; if (bclqmxpListOld.size() <= 0) { @@ -559,12 +555,13 @@ public class BomUploadServiceImpl { }); bclqjbpService.save(bclqjbp); //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + saveFile(file, path, (String) req.getAttribute("yhms")); return map; } + @Transactional(rollbackFor = Exception.class) - public Map xclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int xcdel,MultipartFile file,String path) throws CustomException { + public Map xclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int xcdel, MultipartFile file, String path) throws CustomException { // 判断是否重复导入 Map map = new HashMap(); String id = syService.f_getpjh("DM", "SYSTEM", "CLDE"); @@ -598,7 +595,7 @@ public class BomUploadServiceImpl { // List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) // .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X")); List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) - .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X")); + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X")); if (bclqmxpListOld.size() > 0 && "01".equals(zt) && xcdel == 1) { // 提示是否覆盖 map.put("zt", "02"); @@ -611,10 +608,10 @@ public class BomUploadServiceImpl { // .eq("dc_zl", bclqjbp.getDcZl()).eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "X") // ); bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) - .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X") + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X") ); bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) - .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "X") + .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "X") ); if (bclqmxpListOld.size() <= 0) { } else { @@ -708,7 +705,7 @@ public class BomUploadServiceImpl { } bclqjbpService.save(bclqjbp); //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + saveFile(file, path, (String) req.getAttribute("yhms")); return map; // 判断 INSERT INTO DM_WPJBP(WPH,WPMC,WPFLM,WPXH,WPGG,DC_CH,ZDRY,XGSJ,WPJB,GZLX,JLDW,JLDW1 ) // VALUES (:ls_wpbm,:as_wpmc,:as_wpfl,:as_wpxh,:as_wpgg,:as_dc_ch,:gs_user,:gs_xtrq,'Y','M',:ls_jldw,'19') ; @@ -716,7 +713,7 @@ public class BomUploadServiceImpl { //C16K-2_011批量手工板材统计数据_3跨.BC @Transactional(rollbackFor = Exception.class) - public Map bctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int bctjdel,MultipartFile file,String path) throws CustomException { + public Map bctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int bctjdel, MultipartFile file, String path) throws CustomException { Map map = new HashMap(); List adds = new ArrayList<>(); int indexOfUnderscore = fileName.indexOf('_'); @@ -889,13 +886,13 @@ public class BomUploadServiceImpl { if (adds.size() > 0) { bchxylpService.saveBatch(adds); //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + saveFile(file, path, (String) req.getAttribute("yhms")); } return map; } @Transactional(rollbackFor = Exception.class) - public Map xctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int xctjdel,MultipartFile file,String path) throws CustomException { + public Map xctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int xctjdel, MultipartFile file, String path) throws CustomException { Map map = new HashMap(); List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); @@ -1001,12 +998,13 @@ public class BomUploadServiceImpl { if (adds.size() > 0) { bchxylpService.saveBatch(adds); //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + saveFile(file, path, (String) req.getAttribute("yhms")); } return map; } + @Transactional(rollbackFor = Exception.class) - public Map bctltUpload(List lines, String fileName, HttpServletRequest req, String zt, int tld,MultipartFile file,String path) throws CustomException, ScriptException { + public Map bctltUpload(List lines, String fileName, HttpServletRequest req, String zt, int tld, MultipartFile file, String path) throws CustomException, ScriptException { Map map = new HashMap(); List adds = new ArrayList<>(); List addmxs = new ArrayList<>(); @@ -1190,31 +1188,31 @@ public class BomUploadServiceImpl { bchxmxpService.saveBatch(addmxs); bchxjbpService.saveBatch(adds); //List dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req - Map bomxzjh = bomxzjh(adds, kwxxMap, kwmcMap,qgKwMap, req,addmxs); + Map bomxzjh = bomxzjh(adds, kwxxMap, kwmcMap, qgKwMap, req, addmxs); List adds1 = (List) bomxzjh.get("adds"); List ups = (List) bomxzjh.get("ups"); List yds = (List) bomxzjh.get("ydjhs"); - String delid = (String) bomxzjh.get("deyd"); - if(yds.size()>0){ - for(DmYdjh dmYdjh:yds){ - DmYdjh dmYdjh1 =new DmYdjh(); - dmYdjh1.setZt("99"); - dmYdjh1.setId(dmYdjh.getId()); - dmYdjhService.updateById(dmYdjh1); + String delid = (String) bomxzjh.get("deyd"); + if (yds.size() > 0) { + for (DmYdjh dmYdjh : yds) { + DmYdjh dmYdjh1 = new DmYdjh(); + dmYdjh1.setZt("99"); + dmYdjh1.setId(dmYdjh.getId()); + dmYdjhService.updateById(dmYdjh1); + } } - } dmYdjhService.saveBatch(adds1); dmYdjhService.updateBatchById(ups); // 修正 生产计划。 - DmYdjh delyd=new DmYdjh(); + DmYdjh delyd = new DmYdjh(); delyd.setZt("-1"); delyd.setId(delid); dmYdjhService.updateById(delyd); dmBchxmxpMapper.updateWpgg(czbh, pl); dmBchxmxpMapper.updateWph(czbh, pl); //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + saveFile(file, path, (String) req.getAttribute("yhms")); } // 反写批量表 零件编号 前4位是分段号 addmxs.forEach(e -> { @@ -1242,11 +1240,12 @@ public class BomUploadServiceImpl { // qw1.eq("dc_fd", fd); pgdTzjhService.update(qw1); }); - map.put("yd","yd"); + map.put("yd", "yd"); return map; } + @Transactional(rollbackFor = Exception.class) - public Map ljptbUpload(List lines, String fileName, HttpServletRequest req, String zt, int ldpt,MultipartFile file,String path) throws CustomException { + public Map ljptbUpload(List lines, String fileName, HttpServletRequest req, String zt, int ldpt, MultipartFile file, String path) throws CustomException { List adds = new ArrayList<>(); Map map = new HashMap(); String czbh = ""; @@ -1353,8 +1352,8 @@ public class BomUploadServiceImpl { if (adds.size() > 0) { wlqdService.saveBatch(adds); //insertWpjbbByLjptb(adds); - // //上传文件到服务器 - saveFile(file,path,(String) req.getAttribute("yhms")); + // //上传文件到服务器 + saveFile(file, path, (String) req.getAttribute("yhms")); } adds.forEach(e -> { UpdateWrapper qw = new UpdateWrapper<>(); @@ -1373,6 +1372,7 @@ public class BomUploadServiceImpl { // 根据文件名字得到第二个- 进行拆分 return map; } + @Transactional(rollbackFor = Exception.class) public void insertWpjbbByLjptb(List list) { int wph = dmWpjbpServicel.count(new QueryWrapper().eq("wph", list.get(0).getDcCh() + list.get(0).getDcFd())); @@ -1422,6 +1422,7 @@ public class BomUploadServiceImpl { dmWpjbpServicel.saveBatch(adds); } } + @Transactional(rollbackFor = Exception.class) public void insertwpjbbByxcLq(String wpmc, String wpxh, String wpgg, String ch, String username) { String wpid = syService.f_getpjh("SS", "SYSTEM", "WPH"); @@ -1502,25 +1503,25 @@ public class BomUploadServiceImpl { System.out.println(" = " + "tlt over"); // if (type.equals("01")) { - List ljbList = wlqdService.getLJQDList(querMap); - for (int i = 0; i < ljbList.size(); ) { - if (i == adds.size()) { - BomVO bomVO = new BomVO(); - bomVO.setLjb(ljbList.get(i)); - bomVO.setCs(2); - adds.add(bomVO); + List ljbList = wlqdService.getLJQDList(querMap); + for (int i = 0; i < ljbList.size(); ) { + if (i == adds.size()) { + BomVO bomVO = new BomVO(); + bomVO.setLjb(ljbList.get(i)); + bomVO.setCs(2); + adds.add(bomVO); + i++; + } else { + for (BomVO v : adds) { + v.setLjb(ljbList.get(i)); + v.setCs(2); i++; - } else { - for (BomVO v : adds) { - v.setLjb(ljbList.get(i)); - v.setCs(2); - i++; - if (i == ljbList.size()) { - break; - } + if (i == ljbList.size()) { + break; } } } + } for (int i = 0; i < tltList.size(); ) { @@ -1603,21 +1604,21 @@ public class BomUploadServiceImpl { public List saveBom(HttpServletRequest request, List list, String czbh, String pl, Integer cs1) throws CustomException { if (StringUtils.isNotBlank(czbh) && StringUtils.isNotBlank(pl)) { List oloList = dmBomService.list(new QueryWrapper().eq("dcch", czbh) - .eq("pl", pl) + .eq("pl", pl) ); - Boolean delfag=true; - for(DmBom e:oloList){ - if("Y".equals(e.getFkgs())){ - delfag=false; + Boolean delfag = true; + for (DmBom e : oloList) { + if ("Y".equals(e.getFkgs())) { + delfag = false; break; } } - if (oloList.size() > 0 && delfag ) { + if (oloList.size() > 0 && delfag) { dmBomService.remove(new QueryWrapper().eq("dcch", czbh).eq("pl", pl)); } else if (!delfag) { - throw new CustomException(10106,"不能重新导入请联系管理员"); + throw new CustomException(10106, "不能重新导入请联系管理员"); } } // Map querMap= new HashMap(); @@ -1646,7 +1647,7 @@ public class BomUploadServiceImpl { // } // } - if (2 == cs || 4==cs ) { + if (2 == cs || 4 == cs) { // ArrayList collect = list.stream().collect( // Collectors.collectingAndThen( // Collectors.toCollection( @@ -1654,28 +1655,28 @@ public class BomUploadServiceImpl { // Comparator.comparing( // tc -> tc.getTjb().getWpgg() + ";" + tc.getTjb().getWpxh() + ";" + tc.getTjb().getTzbh()))), ArrayList::new)); ArrayList collect = list.stream() - .collect( - Collectors.collectingAndThen( - Collectors.toCollection( - () -> new TreeSet<>( - Comparator.comparing( - tc -> { - // 检查 tc.getTjb() 是否为 null - if (tc.getTjb() == null) { - // 如果为 null，可以返回一个默认值或抛出异常 - return ""; // 这里返回空字符串作为默认值 - } - // 拼接字段 - return tc.getTjb().getWpgg() + ";" + tc.getTjb().getWpxh() + ";" + tc.getTjb().getTzbh(); - } - ) + .collect( + Collectors.collectingAndThen( + Collectors.toCollection( + () -> new TreeSet<>( + Comparator.comparing( + tc -> { + // 检查 tc.getTjb() 是否为 null + if (tc.getTjb() == null) { + // 如果为 null，可以返回一个默认值或抛出异常 + return ""; // 这里返回空字符串作为默认值 + } + // 拼接字段 + return tc.getTjb().getWpgg() + ";" + tc.getTjb().getWpxh() + ";" + tc.getTjb().getTzbh(); + } + ) + ) + ), + ArrayList::new ) - ), - ArrayList::new - ) - ); + ); collect.forEach(i -> { - if(null !=i.getTjb()){ + if (null != i.getTjb()) { DmBchxylp e = i.getTjb(); if (StringUtils.isNotBlank(e.getWpgg())) { DmBom dmBom = new DmBom(); @@ -1700,7 +1701,8 @@ public class BomUploadServiceImpl { dmBom.setBh(new BigDecimal(e.getWpgg().split("\\*")[0])); try { dmBom.setBc(new BigDecimal(e.getWpgg().split("\\*")[2])); - }catch (Exception e0){} + } catch (Exception e0) { + } String tzbh = e.getTzbh(); String hxlx = ""; @@ -1722,28 +1724,28 @@ public class BomUploadServiceImpl { // 领取表找打 fds if (e.getHxfl().equals("B")) { dmBom.setType("B"); - List collect11 = list.stream().filter(fst -> null!= fst.getBclq() &&fst.getBclq().getWpgg().equals(e.getWpgg()) && - fst.getBclq().getWpxh().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl()) + List collect11 = list.stream().filter(fst -> null != fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpgg()) && + fst.getBclq().getWpxh().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl()) ).collect(Collectors.toList()); if (collect11.size() > 0) { dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); // 还需要 一些其他参数 领取重量 实耗重量 余料重量 前批语料代 零件套料重量 - BigDecimal bs=collect11.get(0).getBclq().getSl(); - if(null==bs){ - bs=new BigDecimal("0"); + BigDecimal bs = collect11.get(0).getBclq().getSl(); + if (null == bs) { + bs = new BigDecimal("0"); } - dmBom.setBcylzl(null==collect11.get(0).getBclq().getYlzl()? null:collect11.get(0).getBclq().getYlzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBclqzl(null==collect11.get(0).getBclq().getLqzl()? null:collect11.get(0).getBclq().getLqzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcshzl(null==collect11.get(0).getBclq().getShzl()? null:collect11.get(0).getBclq().getShzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcljtlzl(null==collect11.get(0).getBclq().getLjzl()? null:collect11.get(0).getBclq().getLjzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcqpyld(null==collect11.get(0).getBclq().getQpyld()? null:collect11.get(0).getBclq().getQpyld().divide(bs,BigDecimal.ROUND_CEILING)); + dmBom.setBcylzl(null == collect11.get(0).getBclq().getYlzl() ? null : collect11.get(0).getBclq().getYlzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBclqzl(null == collect11.get(0).getBclq().getLqzl() ? null : collect11.get(0).getBclq().getLqzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcshzl(null == collect11.get(0).getBclq().getShzl() ? null : collect11.get(0).getBclq().getShzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcljtlzl(null == collect11.get(0).getBclq().getLjzl() ? null : collect11.get(0).getBclq().getLjzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcqpyld(null == collect11.get(0).getBclq().getQpyld() ? null : collect11.get(0).getBclq().getQpyld().divide(bs, BigDecimal.ROUND_CEILING)); } } else { - BigDecimal cd=e.getXccd().divide(new BigDecimal("1000")); - List collect11 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpxh().equals(e.getWpgg()) && - fst.getBclq().getWpgg().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl()) && fst.getBclq().getYlzd11().compareTo(cd)==0 + BigDecimal cd = e.getXccd().divide(new BigDecimal("1000")); + List collect11 = list.stream().filter(fst -> null != fst.getBclq() && fst.getBclq().getWpxh().equals(e.getWpgg()) && + fst.getBclq().getWpgg().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl()) && fst.getBclq().getYlzd11().compareTo(cd) == 0 ).collect(Collectors.toList()); if (collect11.size() > 0) { @@ -1760,7 +1762,7 @@ public class BomUploadServiceImpl { }); } else { list.forEach(i -> { - if(null!= i.getTlt()){ + if (null != i.getTlt()) { DmBchxmxp e = i.getTlt(); if (StringUtils.isNotBlank(e.getWpggZ())) { DmBom dmBom = new DmBom(); @@ -1782,7 +1784,7 @@ public class BomUploadServiceImpl { System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ().split("\\*")[0]); System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ()); dmBom.setBh(new BigDecimal(e.getWpggZ().split("\\*")[0])); - if (e.getWpggZ().split("\\*").length>2){ + if (e.getWpggZ().split("\\*").length > 2) { dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2])); } @@ -1804,21 +1806,21 @@ public class BomUploadServiceImpl { dmBom.setKw(zzcj); dmBom.setLqlb(hxlx); //List collecta = list.stream().filter(fst -> null!= fst.getTjb() && fst.getTjb().getTzbh().equals(e.getTzbhZ()) ).collect(Collectors.toList()); - // dmBom.setYlbs(collecta.get(0).getTjb().getSfyl()); + // dmBom.setYlbs(collecta.get(0).getTjb().getSfyl()); //dmBom.setLqbs("Y"); - if(tzbh.substring(4, 5).equals("X")){ // 型材 + if (tzbh.substring(4, 5).equals("X")) { // 型材 // 先去 统计表中查找 // List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && fst.getTjb().getWpxh().equals(e.getWpxhZ()) && // fst.getTjb().getWpgg().equals(e.getWpggZ()) && fst.getTjb().getDcPl().equals(e.getDcPlZ()) // ).collect(Collectors.toList()); - List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) + List collect11 = list.stream().filter(fst -> null != fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) ).collect(Collectors.toList()); // 找到长度 - if(collect11.size()>0){ - BigDecimal cd=collect11.get(0).getTjb().getXccd().divide(new BigDecimal("1000")); + if (collect11.size() > 0) { + BigDecimal cd = collect11.get(0).getTjb().getXccd().divide(new BigDecimal("1000")); dmBom.setYlbs(collect11.get(0).getTjb().getSfyl()); - List collect111 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpxhZ()) && - fst.getBclq().getWpxh().equals(e.getWpggZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) && fst.getBclq().getYlzd11().compareTo(cd)==0 + List collect111 = list.stream().filter(fst -> null != fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpxhZ()) && + fst.getBclq().getWpxh().equals(e.getWpggZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) && fst.getBclq().getYlzd11().compareTo(cd) == 0 ).collect(Collectors.toList()); if (collect111.size() > 0) { // dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); @@ -1830,34 +1832,34 @@ public class BomUploadServiceImpl { dmBom.setType("X"); - }else { + } else { - List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) + List collect11 = list.stream().filter(fst -> null != fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) ).collect(Collectors.toList()); // 找到长度 - if(collect11.size()>0){ + if (collect11.size() > 0) { dmBom.setYlbhgg(collect11.get(0).getTjb().getYlggs()); } - List collect111 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpggZ()) && - fst.getBclq().getWpxh().equals(e.getWpxhZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) + List collect111 = list.stream().filter(fst -> null != fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpggZ()) && + fst.getBclq().getWpxh().equals(e.getWpxhZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) ).collect(Collectors.toList()); if (collect111.size() > 0) { // dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); // dmBom.setXcgs(collect111.get(0).getBclq().getSl()); // dmBom.setXcshms(collect111.get(0).getBclq().getShms()); - BigDecimal bs=collect111.get(0).getBclq().getSl(); - if(null==bs){ - bs=new BigDecimal("0"); + BigDecimal bs = collect111.get(0).getBclq().getSl(); + if (null == bs) { + bs = new BigDecimal("0"); } - dmBom.setBcylzl(null==collect111.get(0).getBclq().getYlzl()? null:collect111.get(0).getBclq().getYlzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBclqzl(null==collect111.get(0).getBclq().getLqzl()? null:collect111.get(0).getBclq().getLqzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcshzl(null==collect111.get(0).getBclq().getShzl()? null:collect111.get(0).getBclq().getShzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcljtlzl(null==collect111.get(0).getBclq().getLjzl()? null:collect111.get(0).getBclq().getLjzl().divide(bs,BigDecimal.ROUND_CEILING)); - dmBom.setBcqpyld(null==collect111.get(0).getBclq().getQpyld()? null:collect111.get(0).getBclq().getQpyld().divide(bs,BigDecimal.ROUND_CEILING)); + dmBom.setBcylzl(null == collect111.get(0).getBclq().getYlzl() ? null : collect111.get(0).getBclq().getYlzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBclqzl(null == collect111.get(0).getBclq().getLqzl() ? null : collect111.get(0).getBclq().getLqzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcshzl(null == collect111.get(0).getBclq().getShzl() ? null : collect111.get(0).getBclq().getShzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcljtlzl(null == collect111.get(0).getBclq().getLjzl() ? null : collect111.get(0).getBclq().getLjzl().divide(bs, BigDecimal.ROUND_CEILING)); + dmBom.setBcqpyld(null == collect111.get(0).getBclq().getQpyld() ? null : collect111.get(0).getBclq().getQpyld().divide(bs, BigDecimal.ROUND_CEILING)); dmBom.setFds(collect111.get(0).getBclq().getDcFdZ()); } @@ -1872,22 +1874,22 @@ public class BomUploadServiceImpl { }); } - // 根据 adds 去找工时定 导入bom时候 根据目标船只的定额数据 给上值 + // 根据 adds 去找工时定 导入bom时候 根据目标船只的定额数据 给上值 // 切割之前的定额 船号，批量，组立，跨位，规格，领取类别 // 切割之后 零件，规格 DmCbxxp cbbm = dmCbxxpService.getOne(new QueryWrapper().eq("cbbm", czbh)); - if(StringUtils.isNotBlank(cbbm.getSCzbh())){ + if (StringUtils.isNotBlank(cbbm.getSCzbh())) { List oldList = dmBomService.list(new QueryWrapper().eq("dcch", cbbm.getSCzbh()) - .eq("pl", pl).eq("fkgs","Y") + .eq("pl", pl).eq("fkgs", "Y") ); - for(DmBom dmBom :adds){ + for (DmBom dmBom : adds) { DmBom dmBom1 = oldList.stream().filter(fst -> fst.getDcch().equals(dmBom.getDcch()) && fst.getPl().equals(dmBom.getPl()) && - fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && - fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && - fst.getLqlb().equals(dmBom.getLqlb()) + fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && + fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && + fst.getLqlb().equals(dmBom.getLqlb()) ).findFirst().orElse(null); - if(null!=dmBom1){ + if (null != dmBom1) { dmBom.setFkblgs(dmBom1.getFkblgs()); dmBom.setFkpwgs(dmBom1.getFkpwgs()); dmBom.setFkllgs(dmBom1.getFkllgs()); @@ -1896,12 +1898,12 @@ public class BomUploadServiceImpl { dmBom.setFkzpgs(dmBom1.getFkzpgs()); } DmBom dmBom2 = oldList.stream().filter(fst -> fst.getDcch().equals(dmBom.getDcch()) && fst.getPl().equals(dmBom.getPl()) && - fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && - fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && - fst.getLqlb().equals(dmBom.getLqlb()) &&fst.getTzbh().equals(dmBom.getTzbh())&& - fst.getLjbh().equals(dmBom.getLjbh()) + fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && + fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && + fst.getLqlb().equals(dmBom.getLqlb()) && fst.getTzbh().equals(dmBom.getTzbh()) && + fst.getLjbh().equals(dmBom.getLjbh()) ).findFirst().orElse(null); - if(null!=dmBom2){ + if (null != dmBom2) { dmBom.setFkpkgs(dmBom2.getFkpkgs()); dmBom.setFkqgs(dmBom2.getFkqgs()); dmBom.setFkdmgs(dmBom2.getFkdmgs()); @@ -1941,56 +1943,56 @@ public class BomUploadServiceImpl { return ""; } - public void saveFile(MultipartFile file,String path,String yhdm){ - String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,path); - bomMapper.insertFile(url,yhdm); + public void saveFile(MultipartFile file, String path, String yhdm) { + String url = com.dsic.gj_erp.util.FileUtil.handlerUpload(file, path); + bomMapper.insertFile(url, yhdm); } // 查询 船号 批量 修正作业计划 - public Map bomxzjh( List dmBchxjbps,Map kwxxMap, Map kwmcMap,Map qgKwMap , HttpServletRequest req,Listmxs){ - String dcch=dmBchxjbps.get(0).getDcCh(); - String dcpl=dmBchxjbps.get(0).getDcPl(); + public Map bomxzjh(List dmBchxjbps, Map kwxxMap, Map kwmcMap, Map qgKwMap, HttpServletRequest req, List mxs) { + String dcch = dmBchxjbps.get(0).getDcCh(); + String dcpl = dmBchxjbps.get(0).getDcPl(); Map rMap = new HashMap(); List tjListOld = bchxylpService.list(new QueryWrapper().eq("dc_ch", dcch).eq("dc_pl", dcpl)); List bclqmxpList = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", dcch) - .eq("DC_PL_z", dcpl) + .eq("DC_PL_z", dcpl) ); // todo distnce - List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch ) - .eq("dc_pl",dcpl) + List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch) + .eq("dc_pl", dcpl) ); // List ydjhs1 = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch ) // .eq("dc_pl",dcpl).eq("isnull(tzbh,'')","") // ); - DmYdjh ydjhMin=null; - Boolean f=true; - if(ydjhs.size()<0){ - f=false; - }else{ - ydjhMin = dmYdjhMapper.getYdjhMin(dcch, dcpl); + DmYdjh ydjhMin = null; + Boolean f = true; + if (ydjhs.size() < 0) { + f = false; + } else { + ydjhMin = dmYdjhMapper.getYdjhMin(dcch, dcpl); } - Boolean oneadd=false; - if(1==ydjhs.size()){ - oneadd=true; - rMap.put("deyd",ydjhs.get(0).getId()); + Boolean oneadd = false; + if (1 == ydjhs.size()) { + oneadd = true; + rMap.put("deyd", ydjhs.get(0).getId()); } - List adds =new ArrayList<>(); - List ups =new ArrayList<>(); + List adds = new ArrayList<>(); + List ups = new ArrayList<>(); List czList = dmCbxxpService.list(); DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(dcch)).findFirst().orElse(null); - String cjs=""; - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); + String cjs = ""; + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); } - String cjs1=cjs; - for(DmBchxjbp dmBchxjbp1:dmBchxjbps ){ + String cjs1 = cjs; + for (DmBchxjbp dmBchxjbp1 : dmBchxjbps) { //wpgg ,wpxh - // DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1); - DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1); + // DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1); + DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1); // List collect11 = list.stream().filter(fst -> null!= fst.getBclq() &&fst.getBclq().getWpgg().equals(e.getWpgg()) && // fst.getBclq().getWpxh().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl()) // ).collect(Collectors.toList()); @@ -1998,30 +2000,30 @@ public class BomUploadServiceImpl { DmBchxmxp bchxmxp = mxs.stream().filter(fst -> fst.getHxbh().equals(dmBchxjbp.getHxbh())).findFirst().orElse(null); DmBchxylp bchxylp = tjListOld.stream().filter(fst -> fst.getTzbh().equals(dmBchxjbp.getTzbh()) - && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) && fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) && fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) ).findFirst().orElse(null); // dmBchxjbp String wpgg = dmBchxjbp.getWpgg(); String wpxh = dmBchxjbp.getWpxh(); String tzbh = dmBchxjbp.getTzbh(); String hxfl = dmBchxjbp.getHxfl(); - if(StringUtils.isBlank(wpgg)||"hxfl".equals("X")){ + if (StringUtils.isBlank(wpgg) || "hxfl".equals("X")) { continue; } // 根据 材质 规格 去找 生产计划 DmYdjh dmYdjh = ydjhs.stream() - .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) - && StringUtils.isNotBlank(fst.getWpxh()) - && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) - && (fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh()) || ( fst.getWpxh()).equalsIgnoreCase(cjs1 +dmBchxjbp.getWpxh())) - && fst.getTzbh().equalsIgnoreCase(dmBchxjbp.getTzbh()) - ) - .findFirst() - .orElse(null); - if(null!=dmYdjh){ - - String hxlx=""; + .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) + && StringUtils.isNotBlank(fst.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) + && (fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh()) || (fst.getWpxh()).equalsIgnoreCase(cjs1 + dmBchxjbp.getWpxh())) + && fst.getTzbh().equalsIgnoreCase(dmBchxjbp.getTzbh()) + ) + .findFirst() + .orElse(null); + if (null != dmYdjh) { + + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { @@ -2040,42 +2042,43 @@ public class BomUploadServiceImpl { String zzcj = (String) qgKwMap.get(s); //xhj dmYdjh.setKw(zzcj); - if(null!=bchxylp){ - dmYdjh.setYlbs(null==bchxylp.getSfyl()?"":bchxylp.getSfyl()); + dmYdjh.updateZyq(); + if (null != bchxylp) { + dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl()); } - // dmYdjh.setDcFd(dmBchxjbp.getDcFd()); + // dmYdjh.setDcFd(dmBchxjbp.getDcFd()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjh.setLx("X"); - }else{ + } else { dmYdjh.setLx("B"); } - if(null!=bchxmxp){ + if (null != bchxmxp) { dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); } dmYdjh.setBmxgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); dmYdjh.setBmxgry((String) req.getAttribute("yhms")); - if(StringUtils.isNotBlank(dmYdjh.getSlxhth())){ // 说明已经上料 需要修正数据 - // 修正 + if (StringUtils.isNotBlank(dmYdjh.getSlxhth())) { // 说明已经上料 需要修正数据 + // 修正 - }else{ - // 没上料 规格材质 + } else { + // 没上料 规格材质 dmYdjh.setWpgg(dmBchxjbp.getWpgg()); dmYdjh.setWpxh(dmBchxjbp.getWpxh()); } - if(collect11.size()>0){ - double bs=collect11.get(0).getSl().doubleValue(); - - dmYdjh.setBcylzl(null==collect11.get(0).getYlzl()? null:collect11.get(0).getYlzl().doubleValue()); - dmYdjh.setBclqzl(null==collect11.get(0).getLqzl()? null:collect11.get(0).getLqzl().doubleValue()/bs); - dmYdjh.setBcshzl(null==collect11.get(0).getShzl()? null:collect11.get(0).getShzl().doubleValue()/bs); - dmYdjh.setBcljtlzl(null==collect11.get(0).getLjzl()? null:collect11.get(0).getLjzl().doubleValue()/bs); - dmYdjh.setBcqpyld(null==collect11.get(0).getQpyld()? null:collect11.get(0).getQpyld().doubleValue()/bs); + if (collect11.size() > 0) { + double bs = collect11.get(0).getSl().doubleValue(); + + dmYdjh.setBcylzl(null == collect11.get(0).getYlzl() ? null : collect11.get(0).getYlzl().doubleValue()); + dmYdjh.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue() / bs); + dmYdjh.setBcshzl(null == collect11.get(0).getShzl() ? null : collect11.get(0).getShzl().doubleValue() / bs); + dmYdjh.setBcljtlzl(null == collect11.get(0).getLjzl() ? null : collect11.get(0).getLjzl().doubleValue() / bs); + dmYdjh.setBcqpyld(null == collect11.get(0).getQpyld() ? null : collect11.get(0).getQpyld().doubleValue() / bs); } - if(f){ + if (f) { dmYdjh.setSlrq(ydjhMin.getSlrq()); dmYdjh.setPwrq(ydjhMin.getPwrq()); dmYdjh.setHxrq(ydjhMin.getHxrq()); @@ -2093,31 +2096,31 @@ public class BomUploadServiceImpl { ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 - }else{ - dmYdjh = ydjhs.stream() - .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) - && StringUtils.isNotBlank(fst.getWpxh()) - && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) - && (fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh()) || ( fst.getWpxh()).equalsIgnoreCase(cjs1 +dmBchxjbp.getWpxh()) ) - - ) - .findFirst() - .orElse(null); - if(dmYdjh!=null){ - String hxlx=""; + } else { + dmYdjh = ydjhs.stream() + .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) + && StringUtils.isNotBlank(fst.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) + && (fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh()) || (fst.getWpxh()).equalsIgnoreCase(cjs1 + dmBchxjbp.getWpxh())) + + ) + .findFirst() + .orElse(null); + if (dmYdjh != null) { + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { hxlx = "1020"; } - if(collect11.size()>0) { - double bs=collect11.get(0).getSl().doubleValue(); + if (collect11.size() > 0) { + double bs = collect11.get(0).getSl().doubleValue(); dmYdjh.setBcylzl(null == collect11.get(0).getYlzl() ? null : collect11.get(0).getYlzl().doubleValue()); - dmYdjh.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue()/bs); - dmYdjh.setBcshzl(null == collect11.get(0).getShzl() ? null : collect11.get(0).getShzl().doubleValue()/bs); - dmYdjh.setBcljtlzl(null == collect11.get(0).getLjzl() ? null : collect11.get(0).getLjzl().doubleValue()/bs); - dmYdjh.setBcqpyld(null == collect11.get(0).getQpyld() ? null : collect11.get(0).getQpyld().doubleValue()/bs); + dmYdjh.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue() / bs); + dmYdjh.setBcshzl(null == collect11.get(0).getShzl() ? null : collect11.get(0).getShzl().doubleValue() / bs); + dmYdjh.setBcljtlzl(null == collect11.get(0).getLjzl() ? null : collect11.get(0).getLjzl().doubleValue() / bs); + dmYdjh.setBcqpyld(null == collect11.get(0).getQpyld() ? null : collect11.get(0).getQpyld().doubleValue() / bs); } dmYdjh.setLqlb(hxlx); dmYdjh.setTzbh(tzbh); @@ -2125,7 +2128,7 @@ public class BomUploadServiceImpl { dmYdjh.setQgcd(dmBchxjbp.getYlzd4().doubleValue()); dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue()); dmYdjh.setZl(dmBchxjbp.getDcZl()); - if(null!=bchxylp) { + if (null != bchxylp) { dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl()); } String b = (String) kwmcMap.get(tzbh.substring(4, 7)); @@ -2134,27 +2137,28 @@ public class BomUploadServiceImpl { String zzcj = (String) qgKwMap.get(s); //xhj dmYdjh.setKw(zzcj); + dmYdjh.updateZyq(); // dmYdjh.setDcFd(dmBchxjbp.getDcFd()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjh.setLx("X"); - }else{ + } else { dmYdjh.setLx("B"); } - if(null!=bchxmxp) { + if (null != bchxmxp) { dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); } dmYdjh.setBmxgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); dmYdjh.setBmxgry((String) req.getAttribute("yhms")); - if(StringUtils.isNotBlank(dmYdjh.getSlxhth())){ // 说明已经上料 需要修正数据 + if (StringUtils.isNotBlank(dmYdjh.getSlxhth())) { // 说明已经上料 需要修正数据 // 修正 dmYdjh.setJhlx("3"); - }else{ + } else { // 没上料 规格材质 dmYdjh.setWpgg(dmBchxjbp.getWpgg()); dmYdjh.setWpxh(dmBchxjbp.getWpxh()); } - if(f){ + if (f) { dmYdjh.setSlrq(ydjhMin.getSlrq()); dmYdjh.setPwrq(ydjhMin.getPwrq()); dmYdjh.setHxrq(ydjhMin.getHxrq()); @@ -2171,11 +2175,11 @@ public class BomUploadServiceImpl { ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 - }else{ + } else { // 没找到需要把这几条月度计划id 状态改成 -1 - DmYdjh dmYdjhadd =new DmYdjh(); - String hxlx=""; + DmYdjh dmYdjhadd = new DmYdjh(); + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { @@ -2183,24 +2187,24 @@ public class BomUploadServiceImpl { } dmYdjhadd.setDcCh(dmBchxjbp.getDcCh()); dmYdjhadd.setDcPl(dmBchxjbp.getDcPl()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjhadd.setLx("X"); - }else{ + } else { dmYdjhadd.setLx("B"); } dmYdjhadd.setWpgg(dmBchxjbp.getWpgg()); dmYdjhadd.setWpxh(dmBchxjbp.getWpxh()); - if(null!=bchxylp){ - dmYdjhadd.setYlbs( null==bchxylp.getSfyl()?"":bchxylp.getSfyl()); + if (null != bchxylp) { + dmYdjhadd.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl()); } - if(collect11.size()>0) { - double bs=collect11.get(0).getSl().doubleValue(); + if (collect11.size() > 0) { + double bs = collect11.get(0).getSl().doubleValue(); dmYdjhadd.setBcylzl(null == collect11.get(0).getYlzl() ? null : collect11.get(0).getYlzl().doubleValue()); - dmYdjhadd.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue()/bs); - dmYdjhadd.setBcshzl(null == collect11.get(0).getShzl() ? null : collect11.get(0).getShzl().doubleValue()/bs); - dmYdjhadd.setBcljtlzl(null == collect11.get(0).getLjzl() ? null : collect11.get(0).getLjzl().doubleValue()/bs); - dmYdjhadd.setBcqpyld(null == collect11.get(0).getQpyld() ? null : collect11.get(0).getQpyld().doubleValue()/bs); + dmYdjhadd.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue() / bs); + dmYdjhadd.setBcshzl(null == collect11.get(0).getShzl() ? null : collect11.get(0).getShzl().doubleValue() / bs); + dmYdjhadd.setBcljtlzl(null == collect11.get(0).getLjzl() ? null : collect11.get(0).getLjzl().doubleValue() / bs); + dmYdjhadd.setBcqpyld(null == collect11.get(0).getQpyld() ? null : collect11.get(0).getQpyld().doubleValue() / bs); } dmYdjhadd.setLqlb(hxlx); dmYdjhadd.setTzbh(tzbh); @@ -2213,7 +2217,8 @@ public class BomUploadServiceImpl { String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjhadd.setKw(zzcj); - if(null!=bchxmxp){ + dmYdjhadd.updateZyq(); + if (null != bchxmxp) { dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); } @@ -2224,7 +2229,7 @@ public class BomUploadServiceImpl { dmYdjhadd.setBmbzry((String) req.getAttribute("yhms")); // 新增数据得时候 应该看 是不是有排产数据 有排产数据 给上日期 - if(f){ + if (f) { dmYdjhadd.setSlrq(ydjhMin.getSlrq()); dmYdjhadd.setPwrq(ydjhMin.getPwrq()); dmYdjhadd.setHxrq(ydjhMin.getHxrq()); @@ -2238,7 +2243,7 @@ public class BomUploadServiceImpl { dmYdjhadd.setHxjhrq(ydjhMin.getHxjhrq()); dmYdjhadd.setQgjhrq(ydjhMin.getQgjhrq()); dmYdjhadd.setJhlx("3"); - }else{ + } else { // 新增 没有 日期 数据 dmYdjhadd.setJhlx("0"); dmYdjhadd.setSlrq(""); @@ -2259,24 +2264,18 @@ public class BomUploadServiceImpl { } - - } } - - - - rMap.put("adds",adds); - rMap.put("ups",ups); - rMap.put("ydjhs",ydjhs); - return rMap; + rMap.put("adds", adds); + rMap.put("ups", ups); + rMap.put("ydjhs", ydjhs); + return rMap; } - - public void bomxzjhByDm_bchxylp(String dcch ,String dcpl,HttpServletRequest req ){ + public void bomxzjhByDm_bchxylp(String dcch, String dcpl, HttpServletRequest req) { List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); @@ -2285,76 +2284,76 @@ public class BomUploadServiceImpl { Map kwmcMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getZfbz)); Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); List bclqmxpList = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", dcch) - .eq("DC_PL_z", dcpl) + .eq("DC_PL_z", dcpl) ); List tjListOld = bchxylpService.list(new QueryWrapper().eq("dc_ch", dcch).eq("dc_pl", dcpl)); /// 去掉重复数据 tjListOld = tjListOld.stream() - .collect(Collectors.collectingAndThen( - Collectors.toMap( - DmBchxylp::getTzbh, // 以 tzbh 作为键 - Function.identity(), // 保留原对象 - (existing, replacement) -> existing // 遇到重复时保留第一个 - ), - map -> new ArrayList<>(map.values()) // 将 Map 的值转为 List - )); - List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch ) - .eq("dc_pl",dcpl) + .collect(Collectors.collectingAndThen( + Collectors.toMap( + DmBchxylp::getTzbh, // 以 tzbh 作为键 + Function.identity(), // 保留原对象 + (existing, replacement) -> existing // 遇到重复时保留第一个 + ), + map -> new ArrayList<>(map.values()) // 将 Map 的值转为 List + )); + List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch) + .eq("dc_pl", dcpl) ); - DmYdjh ydjhMin=null; - Boolean f=true; - if(ydjhs.size()<0){ - f=false; - }else{ + DmYdjh ydjhMin = null; + Boolean f = true; + if (ydjhs.size() < 0) { + f = false; + } else { ydjhMin = dmYdjhMapper.getYdjhMin(dcch, dcpl); } List czList = dmCbxxpService.list(); DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(dcch)).findFirst().orElse(null); - String cjs=""; - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); + String cjs = ""; + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); } - String cjs1=cjs; - List adds =new ArrayList<>(); - List ups =new ArrayList<>(); - - for(DmBchxylp dmBchxylp :tjListOld){ - boolean aa=false; - for(DmYdjh ydjh :adds){ - if(ydjh.getTzbh().equals(dmBchxylp.getTzbh())){ - aa=true; + String cjs1 = cjs; + List adds = new ArrayList<>(); + List ups = new ArrayList<>(); + + for (DmBchxylp dmBchxylp : tjListOld) { + boolean aa = false; + for (DmYdjh ydjh : adds) { + if (ydjh.getTzbh().equals(dmBchxylp.getTzbh())) { + aa = true; continue; } } - if(aa){ - continue; - } - DmBchxylp dmBchxylp1 = (DmBchxylp) ObjConvertUtils.checkNullNew(dmBchxylp); + if (aa) { + continue; + } + DmBchxylp dmBchxylp1 = (DmBchxylp) ObjConvertUtils.checkNullNew(dmBchxylp); // dmBchxjbp String wpgg = dmBchxylp1.getWpgg(); String wpxh = dmBchxylp1.getWpxh(); String tzbh = dmBchxylp1.getTzbh(); String hxfl = dmBchxylp1.getHxfl(); - if(StringUtils.isBlank(wpgg)||"hxfl".equals("X")){ + if (StringUtils.isBlank(wpgg) || "hxfl".equals("X")) { continue; } DmYdjh dmYdjh = ydjhs.stream() - .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) - && StringUtils.isNotBlank(fst.getWpxh()) - && fst.getWpgg().equalsIgnoreCase(dmBchxylp1.getWpgg()) - && ( - fst.getWpxh().equalsIgnoreCase(dmBchxylp1.getWpxh()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxylp1.getWpxh()) - || ( fst.getWpxh()).equalsIgnoreCase(cjs1 +dmBchxylp1.getWpxh()) + .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) + && StringUtils.isNotBlank(fst.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(dmBchxylp1.getWpgg()) + && ( + fst.getWpxh().equalsIgnoreCase(dmBchxylp1.getWpxh()) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxylp1.getWpxh()) + || (fst.getWpxh()).equalsIgnoreCase(cjs1 + dmBchxylp1.getWpxh()) + ) + && fst.getTzbh().equalsIgnoreCase(dmBchxylp1.getTzbh()) ) - && fst.getTzbh().equalsIgnoreCase(dmBchxylp1.getTzbh()) - ) - .findFirst() - .orElse(null); - if(null!=dmYdjh){ + .findFirst() + .orElse(null); + if (null != dmYdjh) { - String hxlx=""; + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { @@ -2365,32 +2364,33 @@ public class BomUploadServiceImpl { dmYdjh.setTzbh(tzbh); //dmYdjh.setHxcd(dmBchxjbp.getHxcd().doubleValue()); //dmYdjh.setQgcd(dmBchxjbp.getYlzd4().doubleValue()); - // dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue()); - // dmYdjh.setZl(dmBchxjbp.getDcZl()); + // dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue()); + // dmYdjh.setZl(dmBchxjbp.getDcZl()); String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String b = (String) kwmcMap.get(tzbh.substring(4, 7)); dmYdjh.setKwmc(b); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjh.setKw(zzcj); - // if(null!=bchxylp){ - dmYdjh.setYlbs(null==dmBchxylp1.getSfyl()?"":dmBchxylp1.getSfyl()); - // } + dmYdjh.updateZyq(); + // if(null!=bchxylp){ + dmYdjh.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl()); + // } // dmYdjh.setDcFd(dmBchxjbp.getDcFd()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjh.setLx("X"); - }else{ + } else { dmYdjh.setLx("B"); } - // dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); + // dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); dmYdjh.setBmxgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); dmYdjh.setBmxgry((String) req.getAttribute("yhms")); - if(StringUtils.isNotBlank(dmYdjh.getSlxhth())){ // 说明已经上料 需要修正数据 + if (StringUtils.isNotBlank(dmYdjh.getSlxhth())) { // 说明已经上料 需要修正数据 // 修正 - }else{ + } else { // 没上料 规格材质 dmYdjh.setWpgg(dmBchxylp1.getWpgg()); dmYdjh.setWpxh(dmBchxylp1.getWpxh()); @@ -2403,7 +2403,7 @@ public class BomUploadServiceImpl { // dmYdjh.setBcqpyld(null==collect11.get(0).getQpyld()? null:collect11.get(0).getQpyld().doubleValue()); // } - if(f){ + if (f) { dmYdjh.setSlrq(ydjhMin.getSlrq()); dmYdjh.setPwrq(ydjhMin.getPwrq()); dmYdjh.setHxrq(ydjhMin.getHxrq()); @@ -2421,19 +2421,19 @@ public class BomUploadServiceImpl { ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 - }else{ + } else { dmYdjh = ydjhs.stream() - .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) - && StringUtils.isNotBlank(fst.getWpxh()) - && fst.getWpgg().equalsIgnoreCase(dmBchxylp1.getWpgg()) - && (fst.getWpxh().equalsIgnoreCase(dmBchxylp1.getWpxh()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxylp1.getWpxh()) || ( fst.getWpxh()).equalsIgnoreCase(cjs1 +dmBchxylp1.getWpxh()) ) - - ) - .findFirst() - .orElse(null); - if(dmYdjh!=null){ - String hxlx=""; + .filter(fst -> StringUtils.isNotBlank(fst.getWpgg()) + && StringUtils.isNotBlank(fst.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(dmBchxylp1.getWpgg()) + && (fst.getWpxh().equalsIgnoreCase(dmBchxylp1.getWpxh()) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxylp1.getWpxh()) || (fst.getWpxh()).equalsIgnoreCase(cjs1 + dmBchxylp1.getWpxh())) + + ) + .findFirst() + .orElse(null); + if (dmYdjh != null) { + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { @@ -2452,35 +2452,36 @@ public class BomUploadServiceImpl { // dmYdjh.setQgcd(dmBchxjbp.getYlzd4().doubleValue()); // dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue()); // dmYdjh.setZl(dmBchxjbp.getDcZl()); - // if(null!=bchxylp) { - dmYdjh.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl()); - // } + // if(null!=bchxylp) { + dmYdjh.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl()); + // } String b = (String) kwmcMap.get(tzbh.substring(4, 7)); dmYdjh.setKwmc(b); String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjh.setKw(zzcj); + dmYdjh.updateZyq(); // dmYdjh.setDcFd(dmBchxjbp.getDcFd()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjh.setLx("X"); - }else{ + } else { dmYdjh.setLx("B"); } - // dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); + // dmYdjh.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); dmYdjh.setBmxgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); dmYdjh.setBmxgry((String) req.getAttribute("yhms")); - if(StringUtils.isNotBlank(dmYdjh.getSlxhth())){ // 说明已经上料 需要修正数据 + if (StringUtils.isNotBlank(dmYdjh.getSlxhth())) { // 说明已经上料 需要修正数据 // 修正 dmYdjh.setJhlx("3"); - }else{ + } else { // 没上料 规格材质 dmYdjh.setWpgg(dmBchxylp1.getWpgg()); dmYdjh.setWpxh(dmBchxylp1.getWpxh()); } - if(f){ + if (f) { dmYdjh.setSlrq(ydjhMin.getSlrq()); dmYdjh.setPwrq(ydjhMin.getPwrq()); dmYdjh.setHxrq(ydjhMin.getHxrq()); @@ -2497,11 +2498,11 @@ public class BomUploadServiceImpl { ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 - }else{ + } else { // 没找到需要把这几条月度计划id 状态改成 -1 - DmYdjh dmYdjhadd =new DmYdjh(); - String hxlx=""; + DmYdjh dmYdjhadd = new DmYdjh(); + String hxlx = ""; if (tzbh.substring(4, 5).equals("S")) { hxlx = "1010"; } else if (tzbh.substring(4, 5).equals("N")) { @@ -2509,17 +2510,17 @@ public class BomUploadServiceImpl { } dmYdjhadd.setDcCh(dmBchxylp1.getDcCh()); dmYdjhadd.setDcPl(dmBchxylp1.getDcPl()); - if(tzbh.substring(4, 5).equals("X")){ + if (tzbh.substring(4, 5).equals("X")) { dmYdjhadd.setLx("X"); - }else{ + } else { dmYdjhadd.setLx("B"); } dmYdjhadd.setWpgg(dmBchxylp1.getWpgg()); dmYdjhadd.setWpxh(dmBchxylp1.getWpxh()); - // if(null!=bchxylp){ - dmYdjhadd.setYlbs( null==dmBchxylp1.getSfyl()?"":dmBchxylp1.getSfyl()); - // } + // if(null!=bchxylp){ + dmYdjhadd.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl()); + // } // if(collect11.size()>0) { // dmYdjhadd.setBcylzl(null == collect11.get(0).getYlzl() ? null : collect11.get(0).getYlzl().doubleValue()); // dmYdjhadd.setBclqzl(null == collect11.get(0).getLqzl() ? null : collect11.get(0).getLqzl().doubleValue()); @@ -2538,7 +2539,8 @@ public class BomUploadServiceImpl { String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjhadd.setKw(zzcj); - // dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); + dmYdjhadd.updateZyq(); + // dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); dmYdjhadd.setZt("2"); dmYdjhadd.setId(IdWorker.get32UUID()); @@ -2546,7 +2548,7 @@ public class BomUploadServiceImpl { dmYdjhadd.setBmbzry((String) req.getAttribute("yhms")); // 新增数据得时候 应该看 是不是有排产数据 有排产数据 给上日期 - if(f){ + if (f) { dmYdjhadd.setSlrq(ydjhMin.getSlrq()); dmYdjhadd.setPwrq(ydjhMin.getPwrq()); dmYdjhadd.setHxrq(ydjhMin.getHxrq()); @@ -2560,7 +2562,7 @@ public class BomUploadServiceImpl { dmYdjhadd.setHxjhrq(ydjhMin.getHxjhrq()); dmYdjhadd.setQgjhrq(ydjhMin.getQgjhrq()); dmYdjhadd.setJhlx("3"); - }else{ + } else { // 新增 没有 日期 数据 dmYdjhadd.setJhlx("0"); dmYdjhadd.setSlrq(""); @@ -2581,19 +2583,17 @@ public class BomUploadServiceImpl { } - - } } - // rMap.put("adds",adds); - // rMap.put("ups",ups); - // rMap.put("ydjhs",ydjhs); + // rMap.put("adds",adds); + // rMap.put("ups",ups); + // rMap.put("ydjhs",ydjhs); dmYdjhService.saveBatch(adds); dmYdjhService.updateBatchById(ups); - if(ydjhs.size()>0){ - for(DmYdjh dmYdjh:ydjhs){ - DmYdjh dmYdjh1 =new DmYdjh(); + if (ydjhs.size() > 0) { + for (DmYdjh dmYdjh : ydjhs) { + DmYdjh dmYdjh1 = new DmYdjh(); dmYdjh1.setZt("99"); dmYdjh1.setId(dmYdjh.getId()); dmYdjhService.updateById(dmYdjh1);