|
|
|
@ -329,7 +329,17 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ("GB".equals(itemGroup) && blankingSize.contains("*")) {
|
|
|
|
|
if (StringUtil.isBlank(blankingSize)) {
|
|
|
|
|
callItem.setSizeReqQty(callItem.getRequiredQty());
|
|
|
|
|
compQtyMap.put(component, callItem.getRequiredQty());
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ("GB".equals(itemGroup)) {
|
|
|
|
|
if (!blankingSize.contains("*")) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String []size = blankingSize.split("\\*");
|
|
|
|
|
if (size != null && size.length >= 2) {
|
|
|
|
|
int sizeLength = size.length;
|
|
|
|
@ -342,7 +352,13 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
|
|
|
|
|
compQtyMap.put(component, (compQtyMap.get(component) != null ? compQtyMap.get(component).add(sizeReqQty) : sizeReqQty));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
String []size = blankingSize.split("\\*");
|
|
|
|
|
String[] size = new String[1];
|
|
|
|
|
if (blankingSize.contains("*")) {
|
|
|
|
|
size = blankingSize.split("\\*");
|
|
|
|
|
} else {
|
|
|
|
|
size[0] = blankingSize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (size != null && size.length >= 1) {
|
|
|
|
|
int sizeLength = size.length;
|
|
|
|
|
BigDecimal length = new BigDecimal(size[sizeLength-1]);
|
|
|
|
|