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

生成单号规则处理;+

Browse Source
This commit is contained in:
王奎兴
2026-08-12 14:01:56 +08:00
parent 898cc32452
commit 3866bfee05
11 changed files with 204 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java
+3 -2
View File
@@ -476,7 +476,8 @@ public class ReviewOrderApplicationService {
handoverTaskOrderDO.setShipperId(stockOutOrderPO.getShipperId());
handoverTaskOrderDO.setShipperName(stockOutOrderPO.getShipperName());
handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS"));
handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY"));
// handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY"));
handoverTaskOrderDO.setTaskNumber("HD-"+stockOutOrderPO.getOutOrderNumber());
handoverTaskOrderDO.setStatus(1);
handoverTaskOrderDO.setOrderTypeCode(stockOutOrderPO.getOrderTypeCode());
handoverTaskOrderDO.setOrderTypeName(stockOutOrderPO.getOrderTypeName());
@@ -1302,4 +1303,4 @@ public class ReviewOrderApplicationService {
setter.accept(parsed);
}
}
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+1 -1
View File
@@ -870,7 +870,7 @@ public class PickingOrderDomainService {
handoverTaskOrderDO.setShipperId(pickingOrderPO.getShipperId());
handoverTaskOrderDO.setShipperName(pickingOrderPO.getShipperName());
handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS"));
handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY"));
handoverTaskOrderDO.setTaskNumber("HD-"+pickingOrderPO.getOutOrderNumber());
handoverTaskOrderDO.setStatus(1);
handoverTaskOrderDO.setOrderTypeCode(pickingOrderPO.getOrderTypeCode());
handoverTaskOrderDO.setOrderTypeName(pickingOrderPO.getOrderTypeName());
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java
+3 -2
View File
@@ -115,7 +115,8 @@ public class ReviewOrderDomainService {
Date now = new Date();
ReviewOrder header = new ReviewOrder();
header.setReviewOrderNumber(reviewOrderNumber);
// header.setReviewOrderNumber(reviewOrderNumber);
header.setReviewOrderNumber("RE-"+stockOutOrder.getOutOrderNumber());
header.setOutOrderId(stockOutOrder.getOutOrderId());
header.setOutOrderNumber(stockOutOrder.getOutOrderNumber());
header.setOrganizationId(stockOutOrder.getOrganizationId());
@@ -329,4 +330,4 @@ public class ReviewOrderDomainService {
}
return loginUser.getUsername();
}
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+4 -2
View File
@@ -771,7 +771,8 @@ public class StockInOrderDomainService {
stockShelfOrder = list.get(0);
} else {
BeanUtils.copyProperties(stockReceiptOrder, stockShelfOrder);
stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
// stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
stockShelfOrder.setShelfOrderNumber("SH-"+inOrderNumber);
stockShelfOrder.setBatchNo(batchNo);
stockShelfOrderService.save(stockShelfOrder);
}
@@ -1040,7 +1041,8 @@ public class StockInOrderDomainService {
stockInOrderPOList.forEach(p -> {
StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO();
BeanUtils.copyProperties(p, stockReceiptOrderDO);
stockReceiptOrderDO.setReceiptOrderNumber(OrderSequence.getOrderCode("SH"));
stockReceiptOrderDO.setReceiptOrderNumber("RV-"+p.getInOrderNumber());
// stockReceiptOrderDO.setReceiptOrderNumber(OrderSequence.getOrderCode("SH"));
List<InMaterialDetailPO> inMaterialDetailPOs = inMaterialDetailListMap.get(p.getInOrderNumber());
if (!CollectionUtils.isEmpty(inMaterialDetailPOs)){
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = new ArrayList<>();
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+4 -3
View File
@@ -896,7 +896,8 @@ public class StockOutOrderDomainService {
PickingOrderDO pickingOrderDO = new PickingOrderDO();
BeanUtils.copyProperties(p, pickingOrderDO);
pickingOrderDO.setOrderNumber(p.getOutOrderNumber());
pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH"));
// pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH"));
pickingOrderDO.setPickingOrderNumber("PK-"+p.getOutOrderNumber());
pickingOrderDO.setQuantity(p.getAllocationQuantity());
if (pickingOrderDO.getWarehouseId() == null && p.getWarehouseId() != null) {
pickingOrderDO.setWarehouseId(p.getWarehouseId());
@@ -1235,7 +1236,7 @@ public class StockOutOrderDomainService {
PickingOrderDO pickingOrderDO = new PickingOrderDO();
BeanUtils.copyProperties(p, pickingOrderDO);
pickingOrderDO.setOrderNumber(p.getOutOrderNumber());
pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH"));
pickingOrderDO.setPickingOrderNumber("PK-"+p.getOutOrderNumber());
pickingOrderDO.setQuantity(p.getAllocationQuantity());
if (pickingOrderDO.getWarehouseId() == null && p.getWarehouseId() != null) {
pickingOrderDO.setWarehouseId(p.getWarehouseId());
@@ -2151,7 +2152,7 @@ public class StockOutOrderDomainService {
handoverTaskOrderDO.setShipperId(stockOutOrderPO.getShipperId());
handoverTaskOrderDO.setShipperName(stockOutOrderPO.getShipperName());
handoverTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JJZYLS"));
handoverTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JJZY"));
handoverTaskOrderDO.setTaskNumber("HD-"+stockOutOrderPO.getOutOrderNumber());
handoverTaskOrderDO.setStatus(1);
handoverTaskOrderDO.setOrderTypeCode(stockOutOrderPO.getOrderTypeCode());
handoverTaskOrderDO.setOrderTypeName(stockOutOrderPO.getOrderTypeName());
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+2 -1
View File
@@ -187,7 +187,8 @@ public class StockShelfOrderDomainService {
BeanUtils.copyProperties(stockShelfOrderDO, stockShelfOrder, "createBy","createByName","createTime",
"updateBy","updateByName","updateTime");
if (StringUtils.isBlank(stockShelfOrder.getShelfOrderNumber())){
stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
// stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
stockShelfOrder.setShelfOrderNumber("SH-"+stockShelfOrder.getInOrderNumber());
}
// PDA收货完成=是否下发是(1)，PC收货完成/无单收货/整单收货=是否下发否(2)，DO未设置时默认2
stockShelfOrder.setTaskDistribution(stockShelfOrderDO.getTaskDistribution() != null ? stockShelfOrderDO.getTaskDistribution() : 2);
mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java
+2 -2
View File
@@ -211,7 +211,7 @@ public class WaveOrderDomainService {
PickingOrderDO pickingOrderDO = new PickingOrderDO();
BeanUtils.copyProperties(p, pickingOrderDO);
pickingOrderDO.setOrderNumber(p.getWaveOrderNumber());
pickingOrderDO.setPickingOrderNumber(OrderSequence.getOrderCode("JH"));
pickingOrderDO.setPickingOrderNumber("PK-"+p.getWaveOrderNumber());
pickingOrderDO.setQuantity(p.getAllocationQuantity());
pickingOrderDO.setWeightLimit(p.getWeightLimit());
pickingOrderDO.setVolumeLimit(p.getVolumeLimit());
@@ -329,4 +329,4 @@ public class WaveOrderDomainService {
}
return result;
}
}
}