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

关务推送及预约单bug修改；

Browse Source
This commit is contained in:
王奎兴
2026-06-15 17:38:58 +08:00
parent aaf56ceafb
commit b05baac0e5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+3 -1
View File
@@ -451,7 +451,6 @@ public class ReserveStockInOrderDomainService {
reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrder.setOrderTypeName("普通入库"); reservationStockInOrder.setOrderTypeName("普通入库");
reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrderService.save(reservationStockInOrder);
String inOrderNumber = reservationStockInOrder.getInOrderNumber(); String inOrderNumber = reservationStockInOrder.getInOrderNumber();
List<ReserveInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReserveInMaterialDetail>().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber)); List<ReserveInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReserveInMaterialDetail>().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber));
List<ReservationInMaterialDetail> inMaterialDetailList = new ArrayList<>(); List<ReservationInMaterialDetail> inMaterialDetailList = new ArrayList<>();
@@ -467,6 +466,9 @@ public class ReserveStockInOrderDomainService {
//reservationInMaterialDetail.set //reservationInMaterialDetail.set
inMaterialDetailList.add(reservationInMaterialDetail); inMaterialDetailList.add(reservationInMaterialDetail);
} }
BigDecimal quantity = materialDetailList.stream().map(ReserveInMaterialDetail::getReserveQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
reservationStockInOrder.setQuantity(quantity);
reservationStockInOrderService.save(reservationStockInOrder);
reservationInMaterialDetailService.saveBatch(inMaterialDetailList); reservationInMaterialDetailService.saveBatch(inMaterialDetailList);
return update; return update;
} }
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+2 -2
View File
@@ -830,7 +830,7 @@ public class PickingOrderApplicationService {
} else { } else {
item.put("gNo", ""); // 出仓订单行号 item.put("gNo", ""); // 出仓订单行号
} }
item.put("gdsMtno", detail.getMaterialCode() != null ? detail.getMaterialCode() : "");
// 获取物料详情获取单价和币制 // 获取物料详情获取单价和币制
if (detail.getMaterialBaseInfoId() != null) { if (detail.getMaterialBaseInfoId() != null) {
@@ -838,7 +838,7 @@ public class PickingOrderApplicationService {
if (materialInfo != null) { if (materialInfo != null) {
item.put("dclUprcAmt", materialInfo.getUnitPrice()); // 申报单价 item.put("dclUprcAmt", materialInfo.getUnitPrice()); // 申报单价
item.put("dclCurrcd", materialInfo.getCurrency() != null ? materialInfo.getCurrency() : ""); // 申报币制 item.put("dclCurrcd", materialInfo.getCurrency() != null ? materialInfo.getCurrency() : ""); // 申报币制
item.put("gdsMtno", materialInfo.getMaterialCode() != null ? materialInfo.getMaterialCode() : "");
// 计算申报总价 // 计算申报总价
BigDecimal unitPrice = materialInfo.getUnitPrice(); BigDecimal unitPrice = materialInfo.getUnitPrice();
BigDecimal pickingQty = detail.getCheckQuantity() != null ? detail.getCheckQuantity() : detail.getQuantity(); BigDecimal pickingQty = detail.getCheckQuantity() != null ? detail.getCheckQuantity() : detail.getQuantity();