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

fix(oms):修改orderNo

Browse Source
This commit is contained in:
zhaoqing
2026-07-21 21:51:33 +08:00
parent 496548558b
commit 9eff15e483
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
-6
View File
@@ -538,9 +538,6 @@ public class ReservationStockInOrderDomainService {
reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setWarehouseName(warehouseName);
reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber); reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber);
reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode)); reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode));
// 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致
// reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber());
List<ExecutionInMaterialDetail> inMaterialDetailList = new ArrayList<>(); List<ExecutionInMaterialDetail> inMaterialDetailList = new ArrayList<>();
int index = 1; int index = 1;
@@ -694,9 +691,6 @@ public class ReservationStockInOrderDomainService {
reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setWarehouseName(warehouseName);
reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber); reservationStockInOrder.setBusinessInOrderNumber(inOrderNumber);
reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode)); reservationStockInOrder.setInOrderNumber(generateExecutionOrderNumber(warehouseCode));
// 原本 businessOrderNo 通过 BeanUtils.copyProperties 从预约单拷贝，现改为与执行单号一致
// reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getInOrderNumber());
List<ExecutionInMaterialDetail> inMaterialDetailList = new ArrayList<>(); List<ExecutionInMaterialDetail> inMaterialDetailList = new ArrayList<>();
int index = 1; int index = 1;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
-4
View File
@@ -394,8 +394,6 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber); reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber);
reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode)); reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode));
// reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getOutOrderNumber());
List<ExecutionOutMaterialDetail> inMaterialDetailList = new ArrayList<>(); List<ExecutionOutMaterialDetail> inMaterialDetailList = new ArrayList<>();
for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) { for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) {
@@ -520,8 +518,6 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setWarehouseName(warehouseName); reservationStockInOrder.setWarehouseName(warehouseName);
reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber); reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber);
reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode)); reservationStockInOrder.setOutOrderNumber(generateExecutionOrderNumber(warehouseCode));
// reservationStockInOrder.setBusinessOrderNo(byId.getBusinessOrderNo());
reservationStockInOrder.setBusinessOrderNo(reservationStockInOrder.getOutOrderNumber());
List<ExecutionOutMaterialDetail> inMaterialDetailList = new ArrayList<>(); List<ExecutionOutMaterialDetail> inMaterialDetailList = new ArrayList<>();
for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) { for (ReservationOutMaterialDetail reservationOutMaterialDetail : details) {
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class ReserveStockInOrderDomainService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insert(ReserveStockInOrderDO stockInOrderDO) { public Boolean insert(ReserveStockInOrderDO stockInOrderDO) {
if (stockInOrderDO.getInOrderNumber() == null) { if (stockInOrderDO.getInOrderNumber() == null) {
stockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK")); stockInOrderDO.setInOrderNumber(generateReserveOrderNumber());
} }
// //设置默认值 // //设置默认值
// setDefaultValues(stockInOrderDO); // setDefaultValues(stockInOrderDO);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class ReserveStockOutOrderDomainService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) { public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) {
if (stockOutOrderDO.getOutOrderNumber() == null) { if (stockOutOrderDO.getOutOrderNumber() == null) {
stockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK")); stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
} }
// 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
setMaterialDetailInfo(stockOutOrderDO); setMaterialDetailInfo(stockOutOrderDO);