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/application/service/pickingOrder/PickingOrderApplicationService.java
+5 -5
View File
@@ -662,11 +662,11 @@ public class PickingOrderApplicationService {
returnPickingMaterialDetailDO.setTotalNetWeight(outMaterialDetail.getTotalNetWeight()); returnPickingMaterialDetailDO.setTotalNetWeight(outMaterialDetail.getTotalNetWeight());
} }
//是否开启了序列号管理 //是否开启了序列号管理
if (pickingMaterialDetailPO.getSerialNumberManage() == 1){ // if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + pickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + pickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnPickingMaterialDetailDO.setMaterialDetailSerialNumberList(pickingMaterialDetailDO.getMaterialDetailSerialNumberList()); returnPickingMaterialDetailDO.setMaterialDetailSerialNumberList(pickingMaterialDetailDO.getMaterialDetailSerialNumberList());
returnPickingMaterialDetailDOList.add(returnPickingMaterialDetailDO); returnPickingMaterialDetailDOList.add(returnPickingMaterialDetailDO);
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java
+10 -10
View File
@@ -605,11 +605,11 @@ public class ShiftManageApplicationService {
returnShiftMaterialDetailDOChild.setLevel(2); returnShiftMaterialDetailDOChild.setLevel(2);
returnShiftMaterialDetailDOChild.setParentUniqueId(shiftMaterialDetailPO.getUniqueId()); returnShiftMaterialDetailDOChild.setParentUniqueId(shiftMaterialDetailPO.getUniqueId());
//是否开启了序列号管理 //是否开启了序列号管理
if (shiftMaterialDetailPO.getSerialNumberManage() == 1){ // if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnShiftMaterialDetailDOChild.setMaterialDetailSerialNumberList(returnShiftMaterialDetailDOChild.getMaterialDetailSerialNumberList()); returnShiftMaterialDetailDOChild.setMaterialDetailSerialNumberList(returnShiftMaterialDetailDOChild.getMaterialDetailSerialNumberList());
syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDOChild); syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDOChild);
returnShiftMaterialDetailDOChildList.add(returnShiftMaterialDetailDOChild); returnShiftMaterialDetailDOChildList.add(returnShiftMaterialDetailDOChild);
@@ -635,11 +635,11 @@ public class ShiftManageApplicationService {
syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDO); syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDO);
//一级列表 首次收货 //一级列表 首次收货
//是否开启了序列号管理 //是否开启了序列号管理
if (shiftMaterialDetailPO.getSerialNumberManage() == 1){ // if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnShiftMaterialDetailDO.setMaterialDetailSerialNumberList(shiftMaterialDetailDO.getMaterialDetailSerialNumberList()); returnShiftMaterialDetailDO.setMaterialDetailSerialNumberList(shiftMaterialDetailDO.getMaterialDetailSerialNumberList());
returnShiftMaterialDetailDO.setChildren(returnShiftMaterialDetailDOChildList); returnShiftMaterialDetailDO.setChildren(returnShiftMaterialDetailDOChildList);
returnShiftMaterialDetailDOList.add(returnShiftMaterialDetailDO); returnShiftMaterialDetailDOList.add(returnShiftMaterialDetailDO);
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
+5 -5
View File
@@ -240,11 +240,11 @@ public class StockOutTaskOrderApplicationService {
// 抄码拣货：PDA 提交的抄码 id 需透传，assembleParam 从 DB 重建 DO 时否则会丢失 // 抄码拣货：PDA 提交的抄码 id 需透传，assembleParam 从 DB 重建 DO 时否则会丢失
returnTaskPickingMaterialDetailDO.setPickedCopyCodeReferenceIds(taskPickingMaterialDetailDO.getPickedCopyCodeReferenceIds()); returnTaskPickingMaterialDetailDO.setPickedCopyCodeReferenceIds(taskPickingMaterialDetailDO.getPickedCopyCodeReferenceIds());
//是否开启了序列号管理 //是否开启了序列号管理
if (taskPickingMaterialDetailPO.getSerialNumberManage() == 1){ // if (taskPickingMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + taskPickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + taskPickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnTaskPickingMaterialDetailDO.setMaterialDetailSerialNumberList(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList()); returnTaskPickingMaterialDetailDO.setMaterialDetailSerialNumberList(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList());
returnTaskPickingMaterialDetailDOList.add(returnTaskPickingMaterialDetailDO); returnTaskPickingMaterialDetailDOList.add(returnTaskPickingMaterialDetailDO);
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+30 -30
View File
@@ -2816,11 +2816,11 @@ public class StockReceiptOrderApplicationService {
returnReceiptMaterialDetailDOChild.setTotalGrossWeight(returnReceiptMaterialDetailDOChild.getAlreadyReceiptGrossWeight()); returnReceiptMaterialDetailDOChild.setTotalGrossWeight(returnReceiptMaterialDetailDOChild.getAlreadyReceiptGrossWeight());
returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume()); returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume());
returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea()); returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea());
if (receiptMaterialDetailPO.getSerialNumberManage() == 1) { // if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())) { // if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList()); returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList());
returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList()); returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList());
if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) { if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) {
@@ -2884,11 +2884,11 @@ public class StockReceiptOrderApplicationService {
returnReceiptMaterialDetailDO.setReceiptQuantity(parentRetAlreadyQty); returnReceiptMaterialDetailDO.setReceiptQuantity(parentRetAlreadyQty);
preserveParentReceiptLineHierarchyFromDb(receiptMaterialDetailPO, returnReceiptMaterialDetailDO); preserveParentReceiptLineHierarchyFromDb(receiptMaterialDetailPO, returnReceiptMaterialDetailDO);
if (receiptMaterialDetailPO.getReceiptStatus() == 1) { if (receiptMaterialDetailPO.getReceiptStatus() == 1) {
if (receiptMaterialDetailPO.getSerialNumberManage() == 1) { // if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())) { // if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList()); returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList());
returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList()); returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList());
} else { } else {
@@ -3140,11 +3140,11 @@ public class StockReceiptOrderApplicationService {
returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume()); returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume());
returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea()); returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea());
//是否开启了序列号管理 //是否开启了序列号管理
if (receiptMaterialDetailPO.getSerialNumberManage() == 1){ // if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList()); returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList());
returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList()); returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList());
if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) { if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) {
@@ -3257,11 +3257,11 @@ public class StockReceiptOrderApplicationService {
if (receiptMaterialDetailPO.getReceiptStatus() == 1){ if (receiptMaterialDetailPO.getReceiptStatus() == 1){
//一级列表 首次收货 //一级列表 首次收货
//是否开启了序列号管理 //是否开启了序列号管理
if (receiptMaterialDetailPO.getSerialNumberManage() == 1){ // if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList()); returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList());
returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList()); returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList());
}else { }else {
@@ -3386,11 +3386,11 @@ public class StockReceiptOrderApplicationService {
receiptMaterialDetailDOChildByCopy.setAlreadyReceiptQuantity(childQty); receiptMaterialDetailDOChildByCopy.setAlreadyReceiptQuantity(childQty);
BeanUtils.copyProperties(receiptMaterialDetailDOChildByCopy, receiptMaterialDetailDOChild); BeanUtils.copyProperties(receiptMaterialDetailDOChildByCopy, receiptMaterialDetailDOChild);
//是否开启了序列号管理 //是否开启了序列号管理
if (receiptMaterialDetailDO.getSerialNumberManage() == 1){ // if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
actualQuantity = actualQuantity.add(childQty); actualQuantity = actualQuantity.add(childQty);
} }
} }
@@ -3402,11 +3402,11 @@ public class StockReceiptOrderApplicationService {
totalActualReceiptMaterialQuantity += 1; totalActualReceiptMaterialQuantity += 1;
//一级列表 首次收货 //一级列表 首次收货
//是否开启了序列号管理 //是否开启了序列号管理
if (receiptMaterialDetailDO.getSerialNumberManage() == 1){ // if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
inMaterialDetailDO.setQuantity(receiptMaterialDetailDO.getAlreadyReceiptQuantity()); inMaterialDetailDO.setQuantity(receiptMaterialDetailDO.getAlreadyReceiptQuantity());
inMaterialDetailDOList.add(inMaterialDetailDO); inMaterialDetailDOList.add(inMaterialDetailDO);
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+10 -10
View File
@@ -1890,11 +1890,11 @@ public class StockShelfOrderApplicationService {
returnShelfMaterialDetailDOChild.setParentUniqueId(shelfMaterialDetailPO.getUniqueId()); returnShelfMaterialDetailDOChild.setParentUniqueId(shelfMaterialDetailPO.getUniqueId());
// 子项不维护独立计划数量，计划量仅由主项承载 // 子项不维护独立计划数量，计划量仅由主项承载
returnShelfMaterialDetailDOChild.setQuantity(null); returnShelfMaterialDetailDOChild.setQuantity(null);
if (shelfMaterialDetailPO.getSerialNumberManage() == 1){ // if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(shelfMaterialDetailPO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(shelfMaterialDetailPO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + shelfMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + shelfMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnShelfMaterialDetailDOChild.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList()); returnShelfMaterialDetailDOChild.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList());
returnShelfMaterialDetailDOChild.setActualQuantity(returnShelfMaterialDetailDOChild.getShelvesQuantity()); returnShelfMaterialDetailDOChild.setActualQuantity(returnShelfMaterialDetailDOChild.getShelvesQuantity());
returnShelfMaterialDetailDOChild.setAlreadyShelvesQuantity(childShelvesQty); returnShelfMaterialDetailDOChild.setAlreadyShelvesQuantity(childShelvesQty);
@@ -2024,11 +2024,11 @@ public class StockShelfOrderApplicationService {
if (shelfMaterialDetailPO.getShelvesStatus() == 1){ if (shelfMaterialDetailPO.getShelvesStatus() == 1){
//首次上架 //首次上架
//是否开启了序列号管理 //是否开启了序列号管理
if (shelfMaterialDetailPO.getSerialNumberManage() == 1){ // if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())){ // if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())){
throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); // throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} // }
} // }
returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList()); returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList());
}else { }else {
returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(new ArrayList<>()); returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(new ArrayList<>());
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); pickingMaterialDetailList.add(pickingMaterialDetail);
//判断是否开启了序列号管理 //判断是否开启了序列号管理
if (pickingMaterialDetailDb.getSerialNumberManage() == 1) { // if (pickingMaterialDetailDb.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + pickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + pickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(pickingMaterialDetailDO)); // outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(pickingMaterialDetailDO));
} // }
totalPickingQuantity = totalPickingQuantity.add(actualQuantity); 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入库单信息 //更新oms入库单信息
OMSWarehouseEntryDetails(shelfMaterialDetailDO); OMSWarehouseEntryDetails(shelfMaterialDetailDO);
//序列号 //序列号
if (shelfMaterialDetailDO.getSerialNumberManage() == 1) { // if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDO)); // materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDO));
} // }
BigDecimal totalActualQuantity = shelfMaterialDetailDO.getActualQuantity() != null ? shelfMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO; BigDecimal totalActualQuantity = shelfMaterialDetailDO.getActualQuantity() != null ? shelfMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
//判断是否存在子项 //判断是否存在子项
List<ShelfMaterialDetailDO> inMaterialDetailDOChildList = shelfMaterialDetailDO.getChildren(); List<ShelfMaterialDetailDO> inMaterialDetailDOChildList = shelfMaterialDetailDO.getChildren();
@@ -425,12 +425,12 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
shelfMaterialDetailChild.setCreateTime(new Date()); shelfMaterialDetailChild.setCreateTime(new Date());
shelfMaterialDetailChildList.add(shelfMaterialDetailChild); shelfMaterialDetailChildList.add(shelfMaterialDetailChild);
//序列号 //序列号
if (shelfMaterialDetailDO.getSerialNumberManage() == 1) { // if (shelfMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shelfMaterialDetailDOChild.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(shelfMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shelfMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + shelfMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDOChild)); // materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shelfMaterialDetailDOChild));
} // }
BigDecimal childActualQuantity = shelfMaterialDetailDOChild.getActualQuantity() != null ? shelfMaterialDetailDOChild.getActualQuantity() : BigDecimal.ZERO; BigDecimal childActualQuantity = shelfMaterialDetailDOChild.getActualQuantity() != null ? shelfMaterialDetailDOChild.getActualQuantity() : BigDecimal.ZERO;
totalActualQuantity = totalActualQuantity.add(childActualQuantity); 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<>(); List<OutMaterialDetailSerialNumber> materialDetailSerialNumberList = new ArrayList<>();
for (ShiftMaterialDetailDO shiftMaterialDetailDO : shiftMaterialDetailDOList){ for (ShiftMaterialDetailDO shiftMaterialDetailDO : shiftMaterialDetailDOList){
//序列号 //序列号
if (shiftMaterialDetailDO.getSerialNumberManage() == 1) { // if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shiftMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + shiftMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDO)); // materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDO));
} // }
//判断是否存在子项 //判断是否存在子项
List<ShiftMaterialDetailDO> shiftMaterialDetailDOChildList = shiftMaterialDetailDO.getChildren(); List<ShiftMaterialDetailDO> shiftMaterialDetailDOChildList = shiftMaterialDetailDO.getChildren();
List<ShiftMaterialDetail> shiftMaterialDetailListChild = new ArrayList<>(); List<ShiftMaterialDetail> shiftMaterialDetailListChild = new ArrayList<>();
@@ -655,12 +655,12 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
} }
shiftMaterialDetailListChild.add(shiftMaterialDetailChild); shiftMaterialDetailListChild.add(shiftMaterialDetailChild);
//序列号 //序列号
if (shiftMaterialDetailDO.getSerialNumberManage() == 1) { // if (shiftMaterialDetailDO.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + shiftMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + shiftMaterialDetailDOChild.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDOChild)); // materialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(shiftMaterialDetailDOChild));
} // }
} }
} }
ShiftMaterialDetail shiftMaterialDetail = new ShiftMaterialDetail(); 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); taskPickingMaterialDetailList.add(taskPickingMaterialDetail);
//判断是否开启了序列号管理 //判断是否开启了序列号管理
if (taskPickingMaterialDetailDb.getSerialNumberManage() == 1) { // if (taskPickingMaterialDetailDb.getSerialNumberManage() == 1) {
if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())) { //// if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())) {
throw new ServiceException("物料【" + taskPickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空"); //// throw new ServiceException("物料【" + taskPickingMaterialDetailDb.getMaterialName() + "】开启了序列号管理的序列号不能为空");
} //// }
outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(taskPickingMaterialDetailDO)); // outMaterialDetailSerialNumberList.addAll(genMaterialDetailSerialNumber(taskPickingMaterialDetailDO));
} // }
Long pickingUniqueId = taskPickingMaterialDetailDb.getPickingUniqueId(); Long pickingUniqueId = taskPickingMaterialDetailDb.getPickingUniqueId();
BigDecimal qty = taskPickingMaterialDetailDO.getActualQuantity() != null ? taskPickingMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO; BigDecimal qty = taskPickingMaterialDetailDO.getActualQuantity() != null ? taskPickingMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
String basePickedCsv = pickedCsvByPickingUnique.get(pickingUniqueId); String basePickedCsv = pickedCsvByPickingUnique.get(pickingUniqueId);