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

预约单组织修改;

Browse Source
This commit is contained in:
王奎兴
2026-07-06 19:01:30 +08:00
parent 41fa3991d9
commit 02acda9e23
12 changed files with 22 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/executionStockInOrder/repository/persistence/ExecutionStockInOrderImpl.java
+1
View File
@@ -357,6 +357,7 @@ public class ExecutionStockInOrderImpl extends ServiceImpl<ExecutionStockInOrder
reservationStockInOrderDO.setDocumentDate(new Date());
reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrderDO.setOrderTypeName("普通入库");
reservationStockInOrderDO.setBusinessType("pu_tong_ru_ku");
reservationStockInOrderDO.setIssueStatus(0);
reservationStockInOrderDO.setSalesmanId(loginUser.getUserPo().getUserId().toString());
reservationStockInOrderDO.setSalesmanName(loginUser.getUserPo().getUserName());
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java
+7 -7
View File
@@ -132,13 +132,13 @@ public class ExecutionStockInOrderApplicationService {
}
}
// 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
if (stockInOrderDO.getWarehouseId() == null) {
AssociationWarehouseCacheDO associationWarehouseCacheDO =
SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) {
stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
}
// if (stockInOrderDO.getWarehouseId() == null) {
// AssociationWarehouseCacheDO associationWarehouseCacheDO =
// SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
// if (associationWarehouseCacheDO != null) {
// stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
// }
// }
}
// 库管角色过滤：不展示已创建（status=1）的入库单
mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderApplicationService.java
+1
View File
@@ -235,6 +235,7 @@ public class ExecutionStockOutOrderApplicationService {
//设置客户信息
//customerParam(stockOutOrderDO);
stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
stockOutOrderDO.setOrderTypeName("普通出库");
//设置数据字典键值
//setDataDict(stockOutOrderDO);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+1
View File
@@ -383,6 +383,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationStockInOrderDO.setDocumentDate(new Date());
reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrderDO.setOrderTypeName("普通入库");
reservationStockInOrderDO.setBusinessType("pu_tong_ru_ku");
reservationStockInOrderDO.setPriorityLevelCode("yi_ban");
reservationStockInOrderDO.setPriorityLevelName("一般");
reservationStockInOrderDO.setIssueStatus(0);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+2
View File
@@ -519,6 +519,7 @@ public class ReservationStockInOrderDomainService {
reservationStockInOrder.setIssueStatus(0);
reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrder.setOrderTypeName("普通入库");
reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId);
if (warehouseId == null || warehouseId == 0L){
@@ -681,6 +682,7 @@ public class ReservationStockInOrderDomainService {
reservationStockInOrder.setIssueStatus(0);
reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrder.setOrderTypeName("普通入库");
reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId);
reservationStockInOrder.setOrganizationId(orgId);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+1
View File
@@ -252,6 +252,7 @@ public class ReservationStockOutOrderApplicationService {
//设置客户信息
//customerParam(stockOutOrderDO);
stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
stockOutOrderDO.setOrderTypeName("普通出库");
//设置数据字典键值
//setDataDict(stockOutOrderDO);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+2
View File
@@ -370,6 +370,7 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setIssueStatus(0);
reservationStockInOrder.setOrderTypeCode("pu_tong_chu_ku");
reservationStockInOrder.setOrderTypeName("普通出库");
reservationStockInOrder.setBusinessType("pu_tong_chu_ku");
reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId);
reservationStockInOrder.setWarehouseCode(warehouseCode);
@@ -503,6 +504,7 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setIssueStatus(0);
reservationStockInOrder.setOrderTypeCode("pu_tong_chu_ku");
reservationStockInOrder.setOrderTypeName("普通出库");
reservationStockInOrder.setBusinessType("pu_tong_chu_ku");
reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId);
reservationStockInOrder.setOrganizationId(orgId);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+1
View File
@@ -462,6 +462,7 @@ public class ReserveStockInOrderDomainService {
reservationStockInOrder.setIssueStatus(0);
reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrder.setOrderTypeName("普通入库");
reservationStockInOrder.setBusinessType("pu_tong_ru_ku");
reservationStockInOrder.setReservationOrderSource("客户预约");
Long shipperId = reservationStockInOrder.getShipperId();
String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
+1
View File
@@ -260,6 +260,7 @@ public class ReserveStockOutOrderApplicationService {
//设置客户信息
//customerParam(stockOutOrderDO);
stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
stockOutOrderDO.setOrderTypeName("普通出库");
//设置数据字典键值
//setDataDict(stockOutOrderDO);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+1
View File
@@ -293,6 +293,7 @@ public class ReserveStockOutOrderDomainService {
reservationStockOutOrder.setIssueStatus(0);
reservationStockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
reservationStockOutOrder.setOrderTypeName("普通出库");
reservationStockOutOrder.setBusinessType("pu_tong_chu_ku");
reservationStockOutOrder.setReservationOrderSource("客户预约");
Long shipperId = reservationStockOutOrder.getShipperId();
String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+1
View File
@@ -300,6 +300,7 @@ public class StockOutOrderApplicationService {
//设置客户信息
customerParam(stockOutOrderDO);
stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
stockOutOrderDO.setOrderTypeName("普通出库");
//设置数据字典键值
//setDataDict(stockOutOrderDO);
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
+3
View File
@@ -129,6 +129,9 @@ public class ExcelParseService {
if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) {
stockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
}
if (StringUtils.isBlank(stockOutOrder.getBusinessType())) {
stockOutOrder.setBusinessType("pu_tong_chu_ku");
}
if (StringUtils.isBlank(stockOutOrder.getOrderTypeName())) {
stockOutOrder.setOrderTypeName("普通出库");
}