序列号管理的序列号不能为空注释
This commit is contained in:
+5
-5
@@ -662,11 +662,11 @@ public class PickingOrderApplicationService {
|
||||
returnPickingMaterialDetailDO.setTotalNetWeight(outMaterialDetail.getTotalNetWeight());
|
||||
}
|
||||
//是否开启了序列号管理
|
||||
if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + pickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + pickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnPickingMaterialDetailDO.setMaterialDetailSerialNumberList(pickingMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnPickingMaterialDetailDOList.add(returnPickingMaterialDetailDO);
|
||||
}
|
||||
|
||||
+10
-10
@@ -605,11 +605,11 @@ public class ShiftManageApplicationService {
|
||||
returnShiftMaterialDetailDOChild.setLevel(2);
|
||||
returnShiftMaterialDetailDOChild.setParentUniqueId(shiftMaterialDetailPO.getUniqueId());
|
||||
//是否开启了序列号管理
|
||||
if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(shiftMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnShiftMaterialDetailDOChild.setMaterialDetailSerialNumberList(returnShiftMaterialDetailDOChild.getMaterialDetailSerialNumberList());
|
||||
syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDOChild);
|
||||
returnShiftMaterialDetailDOChildList.add(returnShiftMaterialDetailDOChild);
|
||||
@@ -635,11 +635,11 @@ public class ShiftManageApplicationService {
|
||||
syncTotalWeightVolumeAreaToNetWeight(returnShiftMaterialDetailDO);
|
||||
//一级列表 首次收货
|
||||
//是否开启了序列号管理
|
||||
if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (shiftMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(shiftMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + shiftMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnShiftMaterialDetailDO.setMaterialDetailSerialNumberList(shiftMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnShiftMaterialDetailDO.setChildren(returnShiftMaterialDetailDOChildList);
|
||||
returnShiftMaterialDetailDOList.add(returnShiftMaterialDetailDO);
|
||||
|
||||
+5
-5
@@ -240,11 +240,11 @@ public class StockOutTaskOrderApplicationService {
|
||||
// 抄码拣货:PDA 提交的抄码 id 需透传,assembleParam 从 DB 重建 DO 时否则会丢失
|
||||
returnTaskPickingMaterialDetailDO.setPickedCopyCodeReferenceIds(taskPickingMaterialDetailDO.getPickedCopyCodeReferenceIds());
|
||||
//是否开启了序列号管理
|
||||
if (taskPickingMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + taskPickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (taskPickingMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + taskPickingMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnTaskPickingMaterialDetailDO.setMaterialDetailSerialNumberList(taskPickingMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnTaskPickingMaterialDetailDOList.add(returnTaskPickingMaterialDetailDO);
|
||||
}
|
||||
|
||||
+30
-30
@@ -2816,11 +2816,11 @@ public class StockReceiptOrderApplicationService {
|
||||
returnReceiptMaterialDetailDOChild.setTotalGrossWeight(returnReceiptMaterialDetailDOChild.getAlreadyReceiptGrossWeight());
|
||||
returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume());
|
||||
returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea());
|
||||
if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())) {
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList());
|
||||
returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList());
|
||||
if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) {
|
||||
@@ -2884,11 +2884,11 @@ public class StockReceiptOrderApplicationService {
|
||||
returnReceiptMaterialDetailDO.setReceiptQuantity(parentRetAlreadyQty);
|
||||
preserveParentReceiptLineHierarchyFromDb(receiptMaterialDetailPO, returnReceiptMaterialDetailDO);
|
||||
if (receiptMaterialDetailPO.getReceiptStatus() == 1) {
|
||||
if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())) {
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailPO.getSerialNumberManage() == 1) {
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())) {
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList());
|
||||
} else {
|
||||
@@ -3140,11 +3140,11 @@ public class StockReceiptOrderApplicationService {
|
||||
returnReceiptMaterialDetailDOChild.setTotalVolume(returnReceiptMaterialDetailDOChild.getAlreadyReceiptVolume());
|
||||
returnReceiptMaterialDetailDOChild.setTotalArea(returnReceiptMaterialDetailDOChild.getAlreadyReceiptArea());
|
||||
//是否开启了序列号管理
|
||||
if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnReceiptMaterialDetailDOChild.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChild.getMaterialDetailSerialNumberList());
|
||||
returnReceiptMaterialDetailDOChild.setMaterialMoreDetailList(receiptMaterialDetailDOChild.getMaterialMoreDetailList());
|
||||
if (returnReceiptMaterialDetailDOChild.getAlreadyReceiptQuantity() != null) {
|
||||
@@ -3257,11 +3257,11 @@ public class StockReceiptOrderApplicationService {
|
||||
if (receiptMaterialDetailPO.getReceiptStatus() == 1){
|
||||
//一级列表 首次收货
|
||||
//是否开启了序列号管理
|
||||
if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnReceiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnReceiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDO.getMaterialMoreDetailList());
|
||||
}else {
|
||||
@@ -3386,11 +3386,11 @@ public class StockReceiptOrderApplicationService {
|
||||
receiptMaterialDetailDOChildByCopy.setAlreadyReceiptQuantity(childQty);
|
||||
BeanUtils.copyProperties(receiptMaterialDetailDOChildByCopy, receiptMaterialDetailDOChild);
|
||||
//是否开启了序列号管理
|
||||
if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
actualQuantity = actualQuantity.add(childQty);
|
||||
}
|
||||
}
|
||||
@@ -3402,11 +3402,11 @@ public class StockReceiptOrderApplicationService {
|
||||
totalActualReceiptMaterialQuantity += 1;
|
||||
//一级列表 首次收货
|
||||
//是否开启了序列号管理
|
||||
if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (receiptMaterialDetailDO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(receiptMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + receiptMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
inMaterialDetailDO.setQuantity(receiptMaterialDetailDO.getAlreadyReceiptQuantity());
|
||||
inMaterialDetailDOList.add(inMaterialDetailDO);
|
||||
}
|
||||
|
||||
+10
-10
@@ -1890,11 +1890,11 @@ public class StockShelfOrderApplicationService {
|
||||
returnShelfMaterialDetailDOChild.setParentUniqueId(shelfMaterialDetailPO.getUniqueId());
|
||||
// 子项不维护独立计划数量,计划量仅由主项承载
|
||||
returnShelfMaterialDetailDOChild.setQuantity(null);
|
||||
if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(shelfMaterialDetailPO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + shelfMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(shelfMaterialDetailPO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + shelfMaterialDetailPO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnShelfMaterialDetailDOChild.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
returnShelfMaterialDetailDOChild.setActualQuantity(returnShelfMaterialDetailDOChild.getShelvesQuantity());
|
||||
returnShelfMaterialDetailDOChild.setAlreadyShelvesQuantity(childShelvesQty);
|
||||
@@ -2024,11 +2024,11 @@ public class StockShelfOrderApplicationService {
|
||||
if (shelfMaterialDetailPO.getShelvesStatus() == 1){
|
||||
//首次上架
|
||||
//是否开启了序列号管理
|
||||
if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
}
|
||||
}
|
||||
// if (shelfMaterialDetailPO.getSerialNumberManage() == 1){
|
||||
// if (CollectionUtils.isEmpty(shelfMaterialDetailDO.getMaterialDetailSerialNumberList())){
|
||||
// throw new ServiceException("物料【" + shelfMaterialDetailDO.getMaterialName() + "】开启了序列号管理的序列号不能为空");
|
||||
// }
|
||||
// }
|
||||
returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDO.getMaterialDetailSerialNumberList());
|
||||
}else {
|
||||
returnShelfMaterialDetailDO.setMaterialDetailSerialNumberList(new ArrayList<>());
|
||||
|
||||
+6
-6
@@ -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);
|
||||
}
|
||||
|
||||
+12
-12
@@ -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);
|
||||
}
|
||||
|
||||
+12
-12
@@ -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();
|
||||
|
||||
+6
-6
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user