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

出入库预约单下发添加仓库信息;

Browse Source
This commit is contained in:
王奎兴
2026-05-12 15:27:59 +08:00
parent 00745d00b1
commit a2ebe5af25
5 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
+26 -26
View File
@@ -122,32 +122,32 @@ public class ReserveStockInOrderApplicationService {
// 库管角色过滤：不展示已创建（status=1）的入库单 // 库管角色过滤：不展示已创建（status=1）的入库单
// 说明：部分场景下角色码可能不在 userPo.roleCode 中，而在 loginUser.roles/roleList 中。 // 说明：部分场景下角色码可能不在 userPo.roleCode 中，而在 loginUser.roles/roleList 中。
if (loginUser != null) { // if (loginUser != null) {
String targetRoleCode = "KGY-001"; // String targetRoleCode = "KGY-001";
boolean isKuGuan = false; // boolean isKuGuan = false;
//
String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; // String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null;
if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { // if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) {
isKuGuan = true; // isKuGuan = true;
} // }
//
if (!isKuGuan && loginUser.getRoleList() != null) { // if (!isKuGuan && loginUser.getRoleList() != null) {
isKuGuan = loginUser.getRoleList().stream() // isKuGuan = loginUser.getRoleList().stream()
.anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); // .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
} // }
//
if (!isKuGuan && loginUser.getRoles() != null) { // if (!isKuGuan && loginUser.getRoles() != null) {
isKuGuan = loginUser.getRoles().stream() // isKuGuan = loginUser.getRoles().stream()
.anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); // .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
} // }
//
if (isKuGuan) { // if (isKuGuan) {
Integer currentGtStatus = stockInOrderDO.getGtStatus(); // Integer currentGtStatus = stockInOrderDO.getGtStatus();
if (currentGtStatus == null || currentGtStatus < 1) { // if (currentGtStatus == null || currentGtStatus < 1) {
stockInOrderDO.setGtStatus(1); // status > 1 // stockInOrderDO.setGtStatus(1); // status > 1
} // }
} // }
} // }
return stockInOrderDomainService.queryList(stockInOrderDO); return stockInOrderDomainService.queryList(stockInOrderDO);
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+12 -1
View File
@@ -440,7 +440,18 @@ public class ReserveStockInOrderDomainService {
.set(ReserveStockInOrder::getUpdateBy, loginUser.getUserid()) .set(ReserveStockInOrder::getUpdateBy, loginUser.getUserid())
.set(ReserveStockInOrder::getUpdateByName, userRealName) .set(ReserveStockInOrder::getUpdateByName, userRealName)
.set(ReserveStockInOrder::getUpdateTime, new Date()) .set(ReserveStockInOrder::getUpdateTime, new Date())
.in(ReserveStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); .set(ReserveStockInOrder::getWarehouseId, stockInOrderDO.getWarehouseId())
.set(ReserveStockInOrder::getWarehouseCode, stockInOrderDO.getWarehouseCode())
.set(ReserveStockInOrder::getWarehouseName, stockInOrderDO.getWarehouseName())
.eq(ReserveStockInOrder::getInOrderId, stockInOrderDO.getInOrderId()));
List<ReserveInMaterialDetail> list = materialDetailService.list(new LambdaQueryWrapper<ReserveInMaterialDetail>().eq(ReserveInMaterialDetail::getInOrderNumber, stockInOrderDO.getInOrderNumber()));
for (ReserveInMaterialDetail reserveInMaterialDetail : list) {
reserveInMaterialDetail.setWarehouseId(stockInOrderDO.getWarehouseId());
reserveInMaterialDetail.setWarehouseCode(stockInOrderDO.getWarehouseCode());
reserveInMaterialDetail.setWarehouseName(stockInOrderDO.getWarehouseName());
materialDetailService.updateById(reserveInMaterialDetail);
}
//todo下发推送到入库业务单 //todo下发推送到入库业务单
List<Long> inOrderIds = stockInOrderDO.getInOrderIds(); List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
+26 -26
View File
@@ -130,32 +130,32 @@ public class ReserveStockOutOrderApplicationService {
// 库管角色过滤：不展示已创建（status=1）的出库单 // 库管角色过滤：不展示已创建（status=1）的出库单
// 出库状态: 1-已创建 ... // 出库状态: 1-已创建 ...
if (loginUser != null) { // if (loginUser != null) {
String targetRoleCode = "KGY-001"; // String targetRoleCode = "KGY-001";
boolean isKuGuan = false; // boolean isKuGuan = false;
//
String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; // String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null;
if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { // if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) {
isKuGuan = true; // isKuGuan = true;
} // }
//
if (!isKuGuan && loginUser.getRoleList() != null) { // if (!isKuGuan && loginUser.getRoleList() != null) {
isKuGuan = loginUser.getRoleList().stream() // isKuGuan = loginUser.getRoleList().stream()
.anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); // .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
} // }
//
if (!isKuGuan && loginUser.getRoles() != null) { // if (!isKuGuan && loginUser.getRoles() != null) {
isKuGuan = loginUser.getRoles().stream() // isKuGuan = loginUser.getRoles().stream()
.anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); // .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
} // }
//
if (isKuGuan) { // if (isKuGuan) {
Integer currentGtStatus = stockOutOrderDO.getGtStatus(); // Integer currentGtStatus = stockOutOrderDO.getGtStatus();
if (currentGtStatus == null || currentGtStatus < 1) { // if (currentGtStatus == null || currentGtStatus < 1) {
stockOutOrderDO.setGtStatus(1); // status > 1 // stockOutOrderDO.setGtStatus(1); // status > 1
} // }
} // }
} // }
List<ReserveStockOutOrderPO> stockOutOrderPOS = stockOutOrderDomainService.queryList(stockOutOrderDO); List<ReserveStockOutOrderPO> stockOutOrderPOS = stockOutOrderDomainService.queryList(stockOutOrderDO);
// for (ReserveStockOutOrderPO stockOutOrderPO : stockOutOrderPOS) { // for (ReserveStockOutOrderPO stockOutOrderPO : stockOutOrderPOS) {
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+12 -1
View File
@@ -1,5 +1,6 @@
package com.mhd.oms.domain.reserveStockOutOrder.service; package com.mhd.oms.domain.reserveStockOutOrder.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.exception.ServiceException;
@@ -258,8 +259,18 @@ public class ReserveStockOutOrderDomainService {
.set(ReserveStockOutOrder::getUpdateBy, loginUser.getUserid()) .set(ReserveStockOutOrder::getUpdateBy, loginUser.getUserid())
.set(ReserveStockOutOrder::getUpdateByName, userRealName) .set(ReserveStockOutOrder::getUpdateByName, userRealName)
.set(ReserveStockOutOrder::getUpdateTime, new Date()) .set(ReserveStockOutOrder::getUpdateTime, new Date())
.in(ReserveStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); .set(ReserveStockOutOrder::getWarehouseId, stockOutOrderDO.getWarehouseId())
.set(ReserveStockOutOrder::getWarehouseCode, stockOutOrderDO.getWarehouseCode())
.set(ReserveStockOutOrder::getWarehouseName, stockOutOrderDO.getWarehouseName())
.eq(ReserveStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderId()));
List<ReserveOutMaterialDetail> list = outMaterialDetailService.list(new LambdaQueryWrapper<ReserveOutMaterialDetail>().eq(ReserveOutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber()));
for (ReserveOutMaterialDetail reserveOutMaterialDetail : list) {
reserveOutMaterialDetail.setWarehouseId(stockOutOrderDO.getWarehouseId());
reserveOutMaterialDetail.setWarehouseCode(stockOutOrderDO.getWarehouseCode());
reserveOutMaterialDetail.setWarehouseName(stockOutOrderDO.getWarehouseName());
outMaterialDetailService.updateById(reserveOutMaterialDetail);
}
//todo下发推送到wms //todo下发推送到wms
List<Long> outOrderIds = stockOutOrderDO.getOutOrderIds(); List<Long> outOrderIds = stockOutOrderDO.getOutOrderIds();
for (Long outOrderId : outOrderIds) { for (Long outOrderId : outOrderIds) {
mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+3
View File
@@ -256,6 +256,9 @@
<if test="warehouseName != null and warehouseName != ''"> <if test="warehouseName != null and warehouseName != ''">
and a.warehouse_name like concat('%', #{warehouseName}, '%') and a.warehouse_name like concat('%', #{warehouseName}, '%')
</if> </if>
<if test="salesmanId != null ">
and a.salesman_id = #{salesmanId}
</if>
<if test="shipperId != null "> <if test="shipperId != null ">
and a.shipper_id = #{shipperId} and a.shipper_id = #{shipperId}
</if> </if>