|
|
|
@ -67,7 +67,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
DmCzplpNewService dmCzplpNewService;
|
|
|
|
|
@Autowired
|
|
|
|
|
DmTzjhService dmTzjhService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
DmBomService dmBomService;
|
|
|
|
|
|
|
|
|
@ -84,16 +83,28 @@ public class BomUploadServiceImpl {
|
|
|
|
|
int ldpt = 1;
|
|
|
|
|
String czbh1 = "";
|
|
|
|
|
String pl1 = "";
|
|
|
|
|
|
|
|
|
|
List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", czbh)
|
|
|
|
|
.eq(StrUtil.isNotEmpty((String) pl), "pl",pl)
|
|
|
|
|
// List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", czbh)
|
|
|
|
|
// .eq(StrUtil.isNotEmpty((String) pl), "pl",pl)
|
|
|
|
|
// );
|
|
|
|
|
// if(list.size()>0){
|
|
|
|
|
// throw new CustomException(10201, "船号"+czbh+"批量"+pl +"已经提交bom数据 不可修改");
|
|
|
|
|
// }
|
|
|
|
|
// 判断是否导入过
|
|
|
|
|
if (isupload.equals("01")) {
|
|
|
|
|
List<DmBclqjbp> bclqmxpListOld = bclqjbpService.list(new QueryWrapper<DmBclqjbp>().eq("DC_CH", czbh)
|
|
|
|
|
.eq("DC_PL", pl)
|
|
|
|
|
);
|
|
|
|
|
if(list.size()>0){
|
|
|
|
|
throw new CustomException(10201, "船号"+czbh+"批量"+pl +"已经提交bom数据 不可修改");
|
|
|
|
|
if (bclqmxpListOld.size() > 0) {
|
|
|
|
|
Map map = new HashMap();
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return new ResultBean(map);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
boolean fbom = false;
|
|
|
|
|
Integer cs = null;
|
|
|
|
|
for (MultipartFile f : file) {
|
|
|
|
|
String fname = f.getOriginalFilename();
|
|
|
|
|
;
|
|
|
|
|
fname = fname.substring(fname.lastIndexOf('/') + 1);
|
|
|
|
|
System.out.println("fname = " + fname);
|
|
|
|
|
System.out.println(f.getOriginalFilename());
|
|
|
|
@ -106,17 +117,12 @@ public class BomUploadServiceImpl {
|
|
|
|
|
System.out.println("lines = " + e);
|
|
|
|
|
});
|
|
|
|
|
// String delzt="00";
|
|
|
|
|
|
|
|
|
|
if (fname.contains("板材领取表")) {
|
|
|
|
|
|
|
|
|
|
int indexOfUnderscore = fname.indexOf('_');
|
|
|
|
|
|
|
|
|
|
czbh1 = fname.substring(0, indexOfUnderscore);
|
|
|
|
|
// 2. 第一个_后面批前面的字符
|
|
|
|
|
int indexOfSecondUnderscore = fname.lastIndexOf('_');
|
|
|
|
|
|
|
|
|
|
pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批'));
|
|
|
|
|
|
|
|
|
|
Map map = this.bclqbUpload(lines, fname, req, isupload, bcdel);
|
|
|
|
|
bcdel++;
|
|
|
|
|
if (map.get("zt").equals("02")) {
|
|
|
|
@ -124,13 +130,10 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (fname.contains("型材领取表")) {
|
|
|
|
|
|
|
|
|
|
int indexOfUnderscore = fname.indexOf('_');
|
|
|
|
|
|
|
|
|
|
czbh1 = fname.substring(0, indexOfUnderscore);
|
|
|
|
|
// 2. 第一个_后面批前面的字符
|
|
|
|
|
int indexOfSecondUnderscore = fname.lastIndexOf('_');
|
|
|
|
|
|
|
|
|
|
pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批'));
|
|
|
|
|
Map map = this.xclqbUpload(lines, fname, req, isupload, xcdel);
|
|
|
|
|
xcdel++;
|
|
|
|
@ -139,13 +142,10 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (fname.contains("板材统计数据")) {
|
|
|
|
|
|
|
|
|
|
int indexOfUnderscore = fname.indexOf('_');
|
|
|
|
|
|
|
|
|
|
czbh1 = fname.substring(0, indexOfUnderscore);
|
|
|
|
|
// 2. 第一个_后面批前面的字符
|
|
|
|
|
int indexOfSecondUnderscore = fname.lastIndexOf('_');
|
|
|
|
|
|
|
|
|
|
pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批'));
|
|
|
|
|
Map map = this.bctjUpload(lines, fname, req, isupload, bctjdel);
|
|
|
|
|
bctjdel++;
|
|
|
|
@ -154,13 +154,10 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (fname.contains("型材统计数据")) {
|
|
|
|
|
|
|
|
|
|
int indexOfUnderscore = fname.indexOf('_');
|
|
|
|
|
|
|
|
|
|
czbh1 = fname.substring(0, indexOfUnderscore);
|
|
|
|
|
// 2. 第一个_后面批前面的字符
|
|
|
|
|
int indexOfSecondUnderscore = fname.lastIndexOf('_');
|
|
|
|
|
|
|
|
|
|
pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批'));
|
|
|
|
|
Map map = this.xctjUpload(lines, fname, req, isupload, xctjdel);
|
|
|
|
|
xctjdel++;
|
|
|
|
@ -168,15 +165,11 @@ public class BomUploadServiceImpl {
|
|
|
|
|
return new ResultBean(map);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fname.contains("套料图")) {
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
tld++;
|
|
|
|
@ -185,7 +178,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (this.ssum(fname, '-') == 3) {
|
|
|
|
|
|
|
|
|
|
int firstDashIndex = fname.indexOf("-");
|
|
|
|
|
if (firstDashIndex != -1) {
|
|
|
|
|
// 找到第二个短划线的位置,从第一个短划线的下一个位置开始搜索
|
|
|
|
@ -204,8 +196,27 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
// del++;
|
|
|
|
|
}
|
|
|
|
|
for (MultipartFile f : file) {
|
|
|
|
|
String fname = f.getOriginalFilename();
|
|
|
|
|
fname = fname.substring(fname.lastIndexOf('/') + 1);
|
|
|
|
|
if (fname.contains("板材统计数据")) {
|
|
|
|
|
fbom = true;
|
|
|
|
|
cs = 2;
|
|
|
|
|
}
|
|
|
|
|
if (fname.contains("型材统计数据")) {
|
|
|
|
|
fbom = true;
|
|
|
|
|
cs = 2;
|
|
|
|
|
}
|
|
|
|
|
if (fname.contains("套料图")) {
|
|
|
|
|
fbom = true;
|
|
|
|
|
cs = 3;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
FileUtil.del(new File(savePath));
|
|
|
|
|
List<BomVO> dmBoms = this.insertBom(req, czbh, pl, "01");
|
|
|
|
|
if (fbom) {
|
|
|
|
|
this.saveBom(req, dmBoms, czbh, pl, cs);
|
|
|
|
|
}
|
|
|
|
|
Map map = new HashMap();
|
|
|
|
|
map.put("zt", "01");
|
|
|
|
|
map.put("data", dmBoms);
|
|
|
|
@ -277,7 +288,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
List<DmBclqmxp> bclqmxpListOld = bclqmxpService.list(new QueryWrapper<DmBclqmxp>().eq("DC_CH_z", bclqjbp.getDcCh())
|
|
|
|
|
.eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B")
|
|
|
|
|
);
|
|
|
|
|
if (bclqmxpListOld.size() > 0 && "01".equals(zt)) {
|
|
|
|
|
if (bclqmxpListOld.size() > 0 && "01".equals(zt) && bcdel == 1) {
|
|
|
|
|
// 提示是否覆盖
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return map;
|
|
|
|
@ -416,7 +427,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
// .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X"));
|
|
|
|
|
List<DmBclqmxp> bclqmxpListOld = bclqmxpService.list(new QueryWrapper<DmBclqmxp>().eq("DC_CH_z", bclqjbp.getDcCh())
|
|
|
|
|
.eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X"));
|
|
|
|
|
if (bclqmxpListOld.size() > 0 && "01".equals(zt)) {
|
|
|
|
|
if (bclqmxpListOld.size() > 0 && "01".equals(zt) && xcdel == 1) {
|
|
|
|
|
// 提示是否覆盖
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return map;
|
|
|
|
@ -511,7 +522,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
if (list.size() <= 0) {
|
|
|
|
|
List<DmWpjbp> list1 = dmWpjbpServicel.list(new QueryWrapper<DmWpjbp>().eq("WPGG", bclqmxp.getWpxh()).eq("WPXH", bclqmxp.getWpgg()));
|
|
|
|
|
if (list.size() <= 0) {
|
|
|
|
|
|
|
|
|
|
this.insertwpjbbByxcLq(bclqmxp.getWpmc(), bclqmxp.getWpgg(), bclqmxp.getWpxh(), bclqmxp.getDcChZ(), bclqmxp.getZdrZ());
|
|
|
|
|
} else {
|
|
|
|
|
bclqmxp.setWph(list1.get(0).getWph());
|
|
|
|
@ -538,7 +548,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
String czbh = fileName.substring(0, indexOfUnderscore);
|
|
|
|
|
// List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
|
|
|
|
|
// Map<String, String> zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM));
|
|
|
|
|
|
|
|
|
|
List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
|
|
|
|
|
List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
|
|
|
|
|
List<Dm_zhbmp> qgkws = dm_zhbmpRepository.findByBMLB("QGKW");
|
|
|
|
@ -571,7 +580,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
int cs = 0;
|
|
|
|
|
//select count(*) into:li_zl from dm_bchxylp where dc_ch =:dc_ch and dc_pl =:dc_pl and zzcj =:ls_zzcj and hxfl ='B' and tzbh = :ls_import[1];
|
|
|
|
|
List<DmBchxylp> tjListOld = bchxylpService.list(new QueryWrapper<DmBchxylp>().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "B"));
|
|
|
|
|
if (tjListOld.size() > 0 && "01".equals(zt)) {
|
|
|
|
|
if (tjListOld.size() > 0 && "01".equals(zt) && bctjdel == 1) {
|
|
|
|
|
// 提示是否覆盖
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return map;
|
|
|
|
@ -633,7 +642,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
throw new CustomException(10106, fileName + "组立信息不存在");
|
|
|
|
|
}
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
String zzcj = qgKwMap.get(s); //xhj
|
|
|
|
|
bchxylp.setYlzd1(hxlx);
|
|
|
|
|
bchxylp.setZzcj(zzcj);
|
|
|
|
|
bchxylp.setDcZl(zlbm);
|
|
|
|
@ -694,7 +703,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
throw new CustomException(10106, fileName + "组立信息不存在");
|
|
|
|
|
}
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
String zzcj = qgKwMap.get(s); //xhj
|
|
|
|
|
bchxylp.setYlzd1(hxlx);
|
|
|
|
|
bchxylp.setZzcj(zzcj);
|
|
|
|
|
bchxylp.setDcZl(zlbm);
|
|
|
|
@ -737,7 +746,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
int cs = 0;
|
|
|
|
|
//select count(*) into:li_zl from dm_bchxylp where dc_ch =:dc_ch and dc_pl =:dc_pl and zzcj =:ls_zzcj and hxfl ='B' and tzbh = :ls_import[1];
|
|
|
|
|
List<DmBchxylp> tjListOld = bchxylpService.list(new QueryWrapper<DmBchxylp>().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "X"));
|
|
|
|
|
if (tjListOld.size() > 0 && "01".equals(zt)) {
|
|
|
|
|
if (tjListOld.size() > 0 && "01".equals(zt) && xctjdel == 1) {
|
|
|
|
|
// 提示是否覆盖
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return map;
|
|
|
|
@ -789,8 +798,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
|
|
|
|
|
bchxylp.setDrcs(cs + 1);
|
|
|
|
|
ii++;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String tzbh = splitLine[0];
|
|
|
|
|
String hxlx = "";
|
|
|
|
|
if (tzbh.substring(4, 5).equals("S")) {
|
|
|
|
@ -808,8 +815,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
throw new CustomException(10106, fileName + "组立信息不存在");
|
|
|
|
|
}
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
|
|
|
|
|
String zzcj = qgKwMap.get(s); //xhj
|
|
|
|
|
bchxylp.setZzcj(zzcj);
|
|
|
|
|
bchxylp.setDcZl(zlbm);
|
|
|
|
|
adds.add(bchxylp);
|
|
|
|
@ -837,7 +843,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
Map<String, String> kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm));
|
|
|
|
|
Map<String, String> qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM));
|
|
|
|
|
int cs = 0;
|
|
|
|
|
if (tltListOld.size() > 0 && "01".equals(zt)) {
|
|
|
|
|
if (tltListOld.size() > 0 && "01".equals(zt) && tld == 1) {
|
|
|
|
|
// 提示是否覆盖
|
|
|
|
|
map.put("zt", "02");
|
|
|
|
|
return map;
|
|
|
|
@ -883,7 +889,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
throw new CustomException(10106, fileName + "组立信息不存在");
|
|
|
|
|
}
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
String zzcj = qgKwMap.get(s); //xhj
|
|
|
|
|
for (int i = 1; i <= ggsl; i++) {
|
|
|
|
|
DmBchxjbp bchxjbp = new DmBchxjbp();
|
|
|
|
|
String id = syService.f_getpjh("DM", "SYSTEM", "BCHX");
|
|
|
|
@ -1021,7 +1027,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
public Map ljptbUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int ldpt) throws CustomException {
|
|
|
|
|
List<DmWlqd> adds = new ArrayList<>();
|
|
|
|
|
Map map = new HashMap();
|
|
|
|
|
|
|
|
|
|
String czbh = "";
|
|
|
|
|
String pl = "";
|
|
|
|
|
String fd = "";
|
|
|
|
@ -1057,7 +1062,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
map.put("zt", "01");
|
|
|
|
|
}
|
|
|
|
|
List<Dm_zhbmp> sjlxs = dm_zhbmpRepository.findByBMLB("SJLX");
|
|
|
|
|
|
|
|
|
|
Map<String, String> sjlxMap = sjlxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM));
|
|
|
|
|
wlqdService.remove(new QueryWrapper<DmWlqd>().eq("dc_ch", czbh).eq("dc_fd", fd));
|
|
|
|
|
List<Dm_zhbmp> zllbs = null;
|
|
|
|
@ -1224,13 +1228,12 @@ public class BomUploadServiceImpl {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<BomVO> insertBom(HttpServletRequest request, String dcch, String dcpl, String type) throws CustomException {
|
|
|
|
|
|
|
|
|
|
List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", dcch)
|
|
|
|
|
.eq(StrUtil.isNotEmpty((String) dcpl), "pl",dcpl)
|
|
|
|
|
);
|
|
|
|
|
if(list.size()>0){
|
|
|
|
|
throw new CustomException(10201, "船号"+dcch+"批量"+dcpl +"已经提交bom数据 不可在此生成");
|
|
|
|
|
}
|
|
|
|
|
// List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", dcch)
|
|
|
|
|
// .eq(StrUtil.isNotEmpty((String) dcpl), "pl",dcpl)
|
|
|
|
|
// );
|
|
|
|
|
// if(list.size()>0){
|
|
|
|
|
// throw new CustomException(10201, "船号"+dcch+"批量"+dcpl +"已经提交bom数据 不可在此生成");
|
|
|
|
|
// }
|
|
|
|
|
// dmBomService.remove(new QueryWrapper<DmBom>().eq("sjch",dcch).eq("pl",dcpl));
|
|
|
|
|
Map querMap = new HashMap();
|
|
|
|
|
querMap.put("dcch", dcch);
|
|
|
|
@ -1240,7 +1243,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
List<DmBclqmxp> bcLQlList = bclqmxpService.getBcLQlList(querMap);
|
|
|
|
|
List<DmBchxmxp> tltList = bchxmxpService.getTLTList(querMap);
|
|
|
|
|
List<DmBchxylp> bcTJlList = bchxylpService.getBcTJlList(querMap);
|
|
|
|
|
|
|
|
|
|
List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
|
|
|
|
|
List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
|
|
|
|
|
List<Dm_zhbmp> qgkws = dm_zhbmpRepository.findByBMLB("QGKW");
|
|
|
|
@ -1255,59 +1257,64 @@ public class BomUploadServiceImpl {
|
|
|
|
|
adds.add(bomVO);
|
|
|
|
|
bomVO.setCs(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i <bcTJlList.size() ; i++) {
|
|
|
|
|
for (int i = 0; i < bcTJlList.size(); ) {
|
|
|
|
|
if (i == adds.size()) {
|
|
|
|
|
BomVO bomVO = new BomVO();
|
|
|
|
|
bomVO.setTjb(bcTJlList.get(i));
|
|
|
|
|
bomVO.setCs(2);
|
|
|
|
|
adds.add(bomVO);
|
|
|
|
|
i++;
|
|
|
|
|
} else {
|
|
|
|
|
for (BomVO v : adds) {
|
|
|
|
|
v.setTjb(bcTJlList.get(i));
|
|
|
|
|
v.setCs(2);
|
|
|
|
|
i++;
|
|
|
|
|
if (i == bcTJlList.size()) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
for (int i = 0; i <tltList.size() ; i++) {
|
|
|
|
|
}
|
|
|
|
|
for (int i = 0; i < tltList.size(); ) {
|
|
|
|
|
if (i == adds.size()) {
|
|
|
|
|
BomVO bomVO = new BomVO();
|
|
|
|
|
bomVO.setTlt(tltList.get(i));
|
|
|
|
|
bomVO.setCs(3);
|
|
|
|
|
adds.add(bomVO);
|
|
|
|
|
|
|
|
|
|
i++;
|
|
|
|
|
} else {
|
|
|
|
|
for (BomVO v : adds) {
|
|
|
|
|
v.setTlt(tltList.get(i));
|
|
|
|
|
v.setCs(3);
|
|
|
|
|
i++;
|
|
|
|
|
if (i == tltList.size()) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
System.out.println(" = " + "tlt over");
|
|
|
|
|
if (type.equals("01")) {
|
|
|
|
|
List<DmWlqd> ljbList = wlqdService.getLJQDList(querMap);
|
|
|
|
|
for (int i = 0; i <ljbList.size() ; i++) {
|
|
|
|
|
for (int i = 0; i < ljbList.size(); ) {
|
|
|
|
|
if (i == adds.size()) {
|
|
|
|
|
BomVO bomVO = new BomVO();
|
|
|
|
|
bomVO.setLjb(ljbList.get(i));
|
|
|
|
|
bomVO.setCs(4);
|
|
|
|
|
adds.add(bomVO);
|
|
|
|
|
|
|
|
|
|
i++;
|
|
|
|
|
} else {
|
|
|
|
|
for (BomVO v : adds) {
|
|
|
|
|
v.setLjb(ljbList.get(i));
|
|
|
|
|
v.setCs(4);
|
|
|
|
|
i++;
|
|
|
|
|
if (i == ljbList.size()) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// tltList.forEach(e->{
|
|
|
|
|
// if(StringUtils.isNotBlank(e.getWpggZ())){
|
|
|
|
|
//
|
|
|
|
@ -1365,21 +1372,21 @@ public class BomUploadServiceImpl {
|
|
|
|
|
// dmBomService.insertBoms(adds);
|
|
|
|
|
return adds;
|
|
|
|
|
}
|
|
|
|
|
public List<DmBom> saveBom( HttpServletRequest request,List<BomVO>list) throws CustomException {
|
|
|
|
|
|
|
|
|
|
// List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", dcch)
|
|
|
|
|
// .eq(StrUtil.isNotEmpty((String) dcpl), "pl",dcpl)
|
|
|
|
|
// );
|
|
|
|
|
// if(list.size()>0){
|
|
|
|
|
// throw new CustomException(10201, "船号"+dcch+"批量"+dcpl +"已经提交bom数据 不可在此生成");
|
|
|
|
|
// }
|
|
|
|
|
//// dmBomService.remove(new QueryWrapper<DmBom>().eq("sjch",dcch).eq("pl",dcpl));
|
|
|
|
|
public List<DmBom> saveBom(HttpServletRequest request, List<BomVO> list, String czbh, String pl, Integer cs1) throws CustomException {
|
|
|
|
|
if (StringUtils.isNotBlank(czbh) && StringUtils.isNotBlank(pl)) {
|
|
|
|
|
List<DmBom> oloList = dmBomService.list(new QueryWrapper<DmBom>().eq("dcch", czbh)
|
|
|
|
|
.eq("pl", pl)
|
|
|
|
|
);
|
|
|
|
|
if (oloList.size() > 0) {
|
|
|
|
|
dmBomService.remove(new QueryWrapper<DmBom>().eq("dcch", czbh).eq("pl", pl));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Map querMap= new HashMap();
|
|
|
|
|
// querMap.put("dcch",dcch);
|
|
|
|
|
// querMap.put("dcpl",dcpl);
|
|
|
|
|
// querMap.put("delx","B");
|
|
|
|
|
// querMap.put("hxfl","B");
|
|
|
|
|
|
|
|
|
|
List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
|
|
|
|
|
List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
|
|
|
|
|
List<Dm_zhbmp> qgkws = dm_zhbmpRepository.findByBMLB("QGKW");
|
|
|
|
@ -1387,10 +1394,8 @@ public class BomUploadServiceImpl {
|
|
|
|
|
Map<String, String> kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm));
|
|
|
|
|
Map<String, String> qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM));
|
|
|
|
|
List<DmBom> adds = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
int cs = list.get(0).getCs();
|
|
|
|
|
if (2 == cs) {
|
|
|
|
|
|
|
|
|
|
ArrayList<BomVO> collect = list.stream().collect(
|
|
|
|
|
Collectors.collectingAndThen(
|
|
|
|
|
Collectors.toCollection(
|
|
|
|
@ -1400,7 +1405,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
collect.forEach(i -> {
|
|
|
|
|
DmBchxylp e = i.getTjb();
|
|
|
|
|
if (StringUtils.isNotBlank(e.getWpgg())) {
|
|
|
|
|
|
|
|
|
|
DmBom dmBom = new DmBom();
|
|
|
|
|
dmBom.setCs(2);
|
|
|
|
|
// dmBom.setQgcd(e.getYlzd4Z());
|
|
|
|
@ -1412,7 +1416,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
dmBom.setDcch(e.getDcCh());
|
|
|
|
|
dmBom.setPl(e.getDcPl());
|
|
|
|
|
//dmBom.setFd(e.getWph().substring(0,4));
|
|
|
|
|
|
|
|
|
|
dmBom.setSjch(e.getDcCh());
|
|
|
|
|
dmBom.setWpcz(e.getWpxh());
|
|
|
|
|
dmBom.setWpgg(e.getWpgg());
|
|
|
|
|
System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpgg().split("\\*")[0]);
|
|
|
|
@ -1427,12 +1431,9 @@ public class BomUploadServiceImpl {
|
|
|
|
|
} else if (tzbh.substring(4, 5).equals("N")) {
|
|
|
|
|
hxlx = "1020";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 跨位
|
|
|
|
|
String s = kwxxMap.get(tzbh.substring(4, 7));
|
|
|
|
|
|
|
|
|
|
String zl = this.getZL(tzbh);
|
|
|
|
|
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
dmBom.setZl(zlbm);
|
|
|
|
@ -1457,13 +1458,10 @@ public class BomUploadServiceImpl {
|
|
|
|
|
adds.add(dmBom);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
list.forEach(i -> {
|
|
|
|
|
DmBchxmxp e = i.getTlt();
|
|
|
|
|
if (StringUtils.isNotBlank(e.getWpggZ())) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DmBom dmBom = new DmBom();
|
|
|
|
|
dmBom.setCs(3);
|
|
|
|
|
dmBom.setQgcd(e.getYlzd4Z());
|
|
|
|
@ -1475,7 +1473,7 @@ public class BomUploadServiceImpl {
|
|
|
|
|
dmBom.setDcch(e.getDcChZ());
|
|
|
|
|
dmBom.setPl(e.getDcPlZ());
|
|
|
|
|
dmBom.setFd(e.getWph().substring(0, 4));
|
|
|
|
|
|
|
|
|
|
dmBom.setSjch(e.getDcChZ());
|
|
|
|
|
dmBom.setWpcz(e.getWpxhZ());
|
|
|
|
|
dmBom.setWpgg(e.getWpggZ());
|
|
|
|
|
System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ().split("\\*")[0]);
|
|
|
|
@ -1490,13 +1488,10 @@ public class BomUploadServiceImpl {
|
|
|
|
|
} else if (tzbh.substring(4, 5).equals("N")) {
|
|
|
|
|
hxlx = "1020";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 跨位
|
|
|
|
|
System.out.println("tzbh = " + tzbh);
|
|
|
|
|
String s = kwxxMap.get(tzbh.substring(4, 7));
|
|
|
|
|
|
|
|
|
|
String zl = this.getZL(tzbh);
|
|
|
|
|
|
|
|
|
|
String zlbm = zllbMap.get(zl);
|
|
|
|
|
String zzcj = qgKwMap.get(s);
|
|
|
|
|
dmBom.setZl(zlbm);
|
|
|
|
@ -1506,18 +1501,11 @@ public class BomUploadServiceImpl {
|
|
|
|
|
adds.add(dmBom);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dmBomService.insertBoms(adds);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return adds;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 根据套料图号得到组立信息。
|
|
|
|
|
public String getZL(String tzbh) {
|
|
|
|
|
String bh = tzbh.substring(6, 8);
|
|
|
|
@ -1533,7 +1521,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
} else if ("GX".equalsIgnoreCase(bh)) {
|
|
|
|
|
return "光电";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
String bh1 = tzbh.substring(7, 8);
|
|
|
|
|
if ("X".equalsIgnoreCase(bh1)) {
|
|
|
|
@ -1542,8 +1529,6 @@ public class BomUploadServiceImpl {
|
|
|
|
|
if ("D".equalsIgnoreCase(bh1)) {
|
|
|
|
|
return "中大组立";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|