|
|
@ -517,15 +517,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
|
|
|
|
map.put("QUANTITY", mesReportWork.getQuantityQualified());
|
|
|
|
map.put("QUANTITY", mesReportWork.getQuantityQualified());
|
|
|
|
map.put("ERFME", mesReportWork.getUnit());
|
|
|
|
map.put("ERFME", mesReportWork.getUnit());
|
|
|
|
map.put("BATCH", mesReportWork.getBatchSK());
|
|
|
|
map.put("BATCH", mesReportWork.getBatchSK());
|
|
|
|
// if (mesReportWork.getBatch().length()>12){
|
|
|
|
if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
|
|
|
|
// //String batch = mesReportWork.getBatch().substring(12);
|
|
|
|
//String batch = mesReportWork.getBatch().substring(12);
|
|
|
|
// String batch = InterceptionRules(mesReportWork.getBatch());
|
|
|
|
String HSDAT = InterceptionSJRules(mesReportWork.getBatch());
|
|
|
|
//
|
|
|
|
map.put("HSDAT", HSDAT);
|
|
|
|
// }else {
|
|
|
|
}else {
|
|
|
|
// map.put("BATCH", mesReportWork.getBatch());
|
|
|
|
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
|
|
|
|
// }
|
|
|
|
map.put("HSDAT", formattedsDate);
|
|
|
|
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
|
|
|
|
}
|
|
|
|
map.put("HSDAT", formattedsDate);
|
|
|
|
|
|
|
|
mapList.add(map);
|
|
|
|
mapList.add(map);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//过账
|
|
|
|
//过账
|
|
|
@ -565,8 +565,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
|
|
|
|
// }else {
|
|
|
|
// }else {
|
|
|
|
// map.put("BATCH", mesReportWork.getBatch());
|
|
|
|
// map.put("BATCH", mesReportWork.getBatch());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
|
|
|
|
if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
|
|
|
|
map.put("HSDAT", formattedsDate);
|
|
|
|
//String batch = mesReportWork.getBatch().substring(12);
|
|
|
|
|
|
|
|
String HSDAT = InterceptionSJRules(mesReportWork.getBatch());
|
|
|
|
|
|
|
|
map.put("HSDAT", HSDAT);
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
String formattedsDate = mesReportWork.getProductDate().replace("-", "");
|
|
|
|
|
|
|
|
map.put("HSDAT", formattedsDate);
|
|
|
|
|
|
|
|
}
|
|
|
|
mapList.add(map);
|
|
|
|
mapList.add(map);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//过账
|
|
|
|
//过账
|
|
|
@ -1485,6 +1491,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
|
|
|
|
|
|
|
|
|
|
|
|
//去除空格,截取规则,例子:20270106LJ20240107CBCD0J——》240107CBCD
|
|
|
|
//去除空格,截取规则,例子:20270106LJ20240107CBCD0J——》240107CBCD
|
|
|
|
public String InterceptionRules(String batchString){
|
|
|
|
public String InterceptionRules(String batchString){
|
|
|
|
|
|
|
|
boolean containsSpace = batchString.contains(" ");
|
|
|
|
|
|
|
|
if (containsSpace) {//去除空格
|
|
|
|
|
|
|
|
batchString = batchString.replace(" ", "");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
batchString =batchString.substring(12,22);
|
|
|
|
|
|
|
|
return batchString;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//去除空格,截取规则,例子:20270106LJ20240107CBCD0J——》240107CBCD
|
|
|
|
|
|
|
|
public String InterceptionSJRules(String batchString){
|
|
|
|
boolean containsSpace = batchString.contains(" ");
|
|
|
|
boolean containsSpace = batchString.contains(" ");
|
|
|
|
if (containsSpace) {//去除空格
|
|
|
|
if (containsSpace) {//去除空格
|
|
|
|
batchString = batchString.replace(" ", "");
|
|
|
|
batchString = batchString.replace(" ", "");
|
|
|
|