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-07-06 17:23:23 +08:00
parent 196410331b
commit ed8d3fafd9
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/listener/StockInExcelListener.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class StockInExcelListener extends AnalysisEventListener<Map<String, Obje
*/ */
private void parseHeaderData(Map<String, Object> data) { private void parseHeaderData(Map<String, Object> data) {
// 入库日期：查找包含"入库日期"标签的下一个值 // 入库日期：查找包含"入库日期"标签的下一个值
Object stockInDateObj = getValueAfterLabel(data, "入库日期"); Object stockInDateObj = getValueAfterLabel(data, "入庫日期：");
if (stockInDateObj != null) { if (stockInDateObj != null) {
Date stockInDate = convertToDate(stockInDateObj); Date stockInDate = convertToDate(stockInDateObj);
stockInHeader.setStockInDate(stockInDate); stockInHeader.setStockInDate(stockInDate);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+4
View File
@@ -241,6 +241,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationStockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku"); reservationStockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
reservationStockOutOrderDO.setBusinessType("pu_tong_chu_ku"); reservationStockOutOrderDO.setBusinessType("pu_tong_chu_ku");
reservationStockOutOrderDO.setOrderTypeName("普通出库"); reservationStockOutOrderDO.setOrderTypeName("普通出库");
reservationStockOutOrderDO.setPriorityLevelCode("yi_ban");
reservationStockOutOrderDO.setPriorityLevelName("一般");
DeliveryHeader deliveryHeader = deliveryDataDTO.getDeliveryHeader(); DeliveryHeader deliveryHeader = deliveryDataDTO.getDeliveryHeader();
reservationStockOutOrderDO.setTotalAmount(deliveryHeader.getSubtotalAmount()); reservationStockOutOrderDO.setTotalAmount(deliveryHeader.getSubtotalAmount());
reservationStockOutOrderDO.setRoute(deliveryHeader.getDeliveryLineNo()); reservationStockOutOrderDO.setRoute(deliveryHeader.getDeliveryLineNo());
@@ -381,6 +383,8 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationStockInOrderDO.setDocumentDate(new Date()); reservationStockInOrderDO.setDocumentDate(new Date());
reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku"); reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrderDO.setOrderTypeName("普通入库"); reservationStockInOrderDO.setOrderTypeName("普通入库");
reservationStockInOrderDO.setPriorityLevelCode("yi_ban");
reservationStockInOrderDO.setPriorityLevelName("一般");
reservationStockInOrderDO.setIssueStatus(0); reservationStockInOrderDO.setIssueStatus(0);
reservationStockInOrderDO.setSalesmanId(loginUser.getUserPo().getUserId().toString()); reservationStockInOrderDO.setSalesmanId(loginUser.getUserPo().getUserId().toString());
reservationStockInOrderDO.setSalesmanName(loginUser.getUserPo().getUserName()); reservationStockInOrderDO.setSalesmanName(loginUser.getUserPo().getUserName());
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+3 -3
View File
@@ -121,7 +121,7 @@ public class ReserveStockInOrderDomainService {
BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
stockInOrderDO.setVolumeLimit(volumeLimit); stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderService.insert(stockInOrderDO); stockInOrderService.insert(stockInOrderDO);
@@ -150,7 +150,7 @@ public class ReserveStockInOrderDomainService {
// BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); // BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
// stockInOrderDO.setVolumeLimit(volumeLimit); // stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderService.insert(stockInOrderDO); stockInOrderService.insert(stockInOrderDO);
@@ -183,7 +183,7 @@ public class ReserveStockInOrderDomainService {
BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
stockInOrderDO.setVolumeLimit(volumeLimit); stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderService.update(stockInOrderDO); stockInOrderService.update(stockInOrderDO);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+3 -3
View File
@@ -105,7 +105,7 @@ public class ReserveStockOutOrderDomainService {
stockOutOrderDO.setCheckTaskDistribution(2); stockOutOrderDO.setCheckTaskDistribution(2);
} }
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.insert(stockOutOrderDO); stockOutOrderService.insert(stockOutOrderDO);
@@ -139,7 +139,7 @@ public class ReserveStockOutOrderDomainService {
stockOutOrderDO.setCheckTaskDistribution(2); stockOutOrderDO.setCheckTaskDistribution(2);
} }
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.insert(stockOutOrderDO); stockOutOrderService.insert(stockOutOrderDO);
@@ -170,7 +170,7 @@ public class ReserveStockOutOrderDomainService {
BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReserveOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReserveOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
stockOutOrderDO.setVolumeLimit(volumeLimit); stockOutOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); // stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); // stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.update(stockOutOrderDO); stockOutOrderService.update(stockOutOrderDO);