|
|
|
@ -230,7 +230,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { |
|
|
|
.list(); |
|
|
|
|
|
|
|
if (handlingUnits.size() != dto.getHandlingUnitIds().size()) { |
|
|
|
throw new XJException("部分HandlingUnit不存在或站点不匹配"); |
|
|
|
throw new XJException("部分HandlingUnit不存在或site不匹配"); |
|
|
|
} |
|
|
|
|
|
|
|
/* for (HandlingUnit hu : handlingUnits) { |
|
|
|
@ -323,6 +323,12 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { |
|
|
|
}); |
|
|
|
|
|
|
|
group.totalQty = group.totalQty.add(hu.getQty()); |
|
|
|
// 拼接逻辑:如果为空直接赋值,否则加前缀 |
|
|
|
if (group.serialNos.isEmpty()) { |
|
|
|
group.serialNos = hu.getUnitId(); |
|
|
|
} else { |
|
|
|
group.serialNos += ";" + hu.getUnitId(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 为每个分组调用IFS接口 - rqrq |
|
|
|
@ -614,7 +620,8 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { |
|
|
|
group.expiredDate, |
|
|
|
jsonBody, |
|
|
|
ifsResponse, |
|
|
|
errorMessage |
|
|
|
errorMessage, |
|
|
|
group.serialNos |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
@ -637,7 +644,8 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { |
|
|
|
group.expiredDate, |
|
|
|
jsonBody != null ? jsonBody : "请求构建失败", |
|
|
|
ifsResponse != null ? ifsResponse : "未收到响应", |
|
|
|
errorMessage |
|
|
|
errorMessage, |
|
|
|
group.serialNos |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -764,6 +772,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { |
|
|
|
BigDecimal totalQty; |
|
|
|
Date expiredDate; |
|
|
|
String engChgLevel; // 工程变更级别,默认1 |
|
|
|
String serialNos; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|