weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

序列号管理的序列号不能为空注释

Browse Source
This commit is contained in:
秦鸿展
2026-04-23 02:24:57 +08:00
parent 9484bc5e8d
commit 7434307880
9 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
+6 -6
View File
@@ -208,12 +208,12 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
pickingMaterialDetailList.add(pickingMaterialDetail);
//判断是否开启了序列号管理
if (pickingMaterialDetailDb.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + pickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(pickingMaterialDetailDO));
}
// if (pickingMaterialDetailDb.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + pickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(pickingMaterialDetailDO));
// }
totalPickingQuantity = totalPickingQuantity.add(actualQuantity);
}
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
+12 -12
View File
@@ -400,12 +400,12 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
//更新oms入库单信息
OMSWarehouseEntryDetails(shelfMaterialDetailDO);
//序列号
if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDO));
}
// if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDO));
// }
BigDecimal totalActualQuantity = shelfMaterialDetailDO.getActualQuantity() != null ? shelfMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
//判断是否存在子项
List<ShelfMaterialDetailDO> inMaterialDetailDOChildList = shelfMaterialDetailDO.getChildren();
@@ -425,12 +425,12 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
shelfMaterialDetailChild.setCreateTime(new Date());
shelfMaterialDetailChildList.add(shelfMaterialDetailChild);
//序列号
if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shelfMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shelfMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDOChild));
}
// if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(shelfMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + shelfMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDOChild));
// }
BigDecimal childActualQuantity = shelfMaterialDetailDOChild.getActualQuantity() != null ? shelfMaterialDetailDOChild.getActualQuantity() : BigDecimal.ZERO;
totalActualQuantity = totalActualQuantity.add(childActualQuantity);
}
mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+12 -12
View File
@@ -631,12 +631,12 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
List<OutMaterialDetailSerialNumber> materialDetailSerialNumberList = new ArrayList<>();
for (ShiftMaterialDetailDO shiftMaterialDetailDO : shiftMaterialDetailDOList){
//序列号
if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shiftMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDO));
}
// if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + shiftMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDO));
// }
//判断是否存在子项
List<ShiftMaterialDetailDO> shiftMaterialDetailDOChildList = shiftMaterialDetailDO.getChildren();
List<ShiftMaterialDetail> shiftMaterialDetailListChild = new ArrayList<>();
@@ -655,12 +655,12 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
}
shiftMaterialDetailListChild.add(shiftMaterialDetailChild);
//序列号
if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shiftMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDOChild));
}
// if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + shiftMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDOChild));
// }
}
}
ShiftMaterialDetail shiftMaterialDetail = new ShiftMaterialDetail();
mhd_wms/src/main/java/com/mhd/wms/domain/taskPickingMaterialDetail/repository/persistence/TaskPickingMaterialDetailImpl.java
+6 -6
View File
@@ -183,12 +183,12 @@ public class TaskPickingMaterialDetailImpl extends ServiceImpl<TaskPickingMateri
}
taskPickingMaterialDetailList.add(taskPickingMaterialDetail);
//判断是否开启了序列号管理
if (taskPickingMaterialDetailDb.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + taskPickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
}
outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(taskPickingMaterialDetailDO));
}
// if (taskPickingMaterialDetailDb.getSerialNumberManage() == 1) {
//// if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
//// throw new ServiceException("物料【" + taskPickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
//// }
// outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(taskPickingMaterialDetailDO));
// }
Long pickingUniqueId = taskPickingMaterialDetailDb.getPickingUniqueId();
BigDecimal qty = taskPickingMaterialDetailDO.getActualQuantity() != null ? taskPickingMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
String basePickedCsv = pickedCsvByPickingUnique.get(pickingUniqueId);