|
@@ -3069,6 +3069,31 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ List<ApsWorkInProgressInventoryDo> workInProgressInventoryDos = new LinkedList<>();
|
|
|
+ if (ObjectUtil.isNotEmpty(addBatchNumberList)) {
|
|
|
+ //查询新增的批次号
|
|
|
+ workInProgressInventoryDos =
|
|
|
+ apsWorkInProgressInventoryService.list(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda()
|
|
|
+ .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
|
|
|
+ .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
|
|
|
+ }
|
|
|
+ for (int i = 0; i < addBatchNumberList.size(); i++) {
|
|
|
+ String s = addBatchNumberList.get(i);
|
|
|
+ String addBatchNumber = s;
|
|
|
+ //如果该批次号物料在制品库存中没找到,则错误提示:批次号{批次号}错误
|
|
|
+ ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = workInProgressInventoryDos.stream().filter(item -> item.getBatchnumber().equals(addBatchNumber)).findFirst().orElse(null);
|
|
|
+ if (ObjectUtil.isEmpty(apsWorkInProgressInventoryDo)) {
|
|
|
+ /**
|
|
|
+ * 如果该批次号没有对应在制品库存,表示线下批次号,
|
|
|
+ * 如果批次号没有前缀*,则加上前缀*
|
|
|
+ */
|
|
|
+ if (!s.startsWith("*")) {
|
|
|
+ s = "*" + s;
|
|
|
+ addBatchNumberList.set(i, s);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// //如果批次号有重复,则错误提示:批次号{批次号}重复
|
|
|
// for (String item : batchNumberList) {
|
|
|
// if (batchNumberList.stream().filter(i -> i.equals(item)).count() > 1) {
|