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

发30

Browse Source
This commit is contained in:
王奎兴
2026-08-20 15:30:59 +08:00
parent e23edadde6
commit 57f87baf85
6 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class HandoverTaskOrderApplicationService {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!handoverTaskOrderIds.isEmpty()) { if (!handoverTaskOrderIds.isEmpty()) {
HandoverTaskOrderDO completeDO = new HandoverTaskOrderDO(); HandoverTaskOrderDO completeDO = new HandoverTaskOrderDO();
completeDO.setHandoverTaskOrderIds(handoverTaskOrderIds); completeDO.setHandoverTaskOrderIds(handoverTaskOrderIds.stream().map(String::valueOf).collect(Collectors.toList()));
completeDO.setBillingJson(handoverTaskOrderDO.getBillingJson()); completeDO.setBillingJson(handoverTaskOrderDO.getBillingJson());
handoverTaskOrderDomainService.completeHandover(completeDO); handoverTaskOrderDomainService.completeHandover(completeDO);
} }
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java
+8 -1
View File
@@ -112,7 +112,14 @@ public class HandoverTaskOrderImpl extends ServiceImpl<HandoverTaskOrderMapper,
@Override @Override
public boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO) { public boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds();
List<Long> handoverTaskOrderIds = null;
if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) {
handoverTaskOrderIds = handoverTaskOrderIdsStr.stream()
.filter(str -> str != null && !str.trim().isEmpty())
.map(Long::valueOf)
.collect(Collectors.toList());
}
if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) {
return false; return false;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity {
private Long permissionMenuId; private Long permissionMenuId;
@ApiModelProperty("交接作业单id") @ApiModelProperty("交接作业单id")
private List<Long> handoverTaskOrderIds; private List<String> handoverTaskOrderIds;
@ApiModelProperty("交接作业单id") @ApiModelProperty("交接作业单id")
private List<String> handoverTaskOrderIdsStr; private List<String> handoverTaskOrderIdsStr;
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+29 -9
View File
@@ -61,6 +61,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -97,7 +98,7 @@ public class HandoverTaskOrderDomainService {
private IStockOutOrderService stockOutOrderService; private IStockOutOrderService stockOutOrderService;
@Autowired @Autowired
private CopyCodeReferenceDomainService copyCodeReferenceDomainService; private CopyCodeReferenceDomainService copyCodeReferenceDomainService;
@Autowired @Resource
private OmsServiceFeign omsServiceFeign; private OmsServiceFeign omsServiceFeign;
// @Autowired // @Autowired
// private ICustomsDeclarationDetailService customsDeclarationDetailService; // private ICustomsDeclarationDetailService customsDeclarationDetailService;
@@ -250,7 +251,14 @@ public class HandoverTaskOrderDomainService {
* @return Boolean * @return Boolean
*/ */
public Boolean allocationPlatform(HandoverTaskOrderDO handoverTaskOrderDO){ public Boolean allocationPlatform(HandoverTaskOrderDO handoverTaskOrderDO){
List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds();
List<Long> handoverTaskOrderIds = null;
if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) {
handoverTaskOrderIds = handoverTaskOrderIdsStr.stream()
.filter(str -> str != null && !str.trim().isEmpty())
.map(Long::valueOf)
.collect(Collectors.toList());
}
if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) {
return false; return false;
} }
@@ -285,7 +293,14 @@ public class HandoverTaskOrderDomainService {
* @return Boolean * @return Boolean
*/ */
public Boolean releasePlatform(HandoverTaskOrderDO handoverTaskOrderDO){ public Boolean releasePlatform(HandoverTaskOrderDO handoverTaskOrderDO){
List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds();
List<Long> handoverTaskOrderIds = null;
if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) {
handoverTaskOrderIds = handoverTaskOrderIdsStr.stream()
.filter(str -> str != null && !str.trim().isEmpty())
.map(Long::valueOf)
.collect(Collectors.toList());
}
if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) {
return false; return false;
} }
@@ -315,16 +330,14 @@ public class HandoverTaskOrderDomainService {
* @return Boolean * @return Boolean
*/ */
public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO) { public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO) {
List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds();
System.out.println("completeHandover1111"+handoverTaskOrderIds); List<Long> handoverTaskOrderIds = null;
List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIdsStr();
if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) {
handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() handoverTaskOrderIds = handoverTaskOrderIdsStr.stream()
.filter(str -> str != null && !str.trim().isEmpty()) .filter(str -> str != null && !str.trim().isEmpty())
.map(Long::valueOf) .map(Long::valueOf)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
System.out.println("completeHandover"+handoverTaskOrderIds);
if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) {
return false; return false;
} }
@@ -707,7 +720,14 @@ public class HandoverTaskOrderDomainService {
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO) { public boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO) {
List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); List<String> handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds();
List<Long> handoverTaskOrderIds = null;
if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) {
handoverTaskOrderIds = handoverTaskOrderIdsStr.stream()
.filter(str -> str != null && !str.trim().isEmpty())
.map(Long::valueOf)
.collect(Collectors.toList());
}
if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) {
throw new ServiceException("未选择交接作业单，请重新选择"); throw new ServiceException("未选择交接作业单，请重新选择");
} }
@@ -719,7 +739,7 @@ public class HandoverTaskOrderDomainService {
throw new ServiceException("交接作业单ID不能为空，请重新选择"); throw new ServiceException("交接作业单ID不能为空，请重新选择");
} }
// 更新 DO 对象中的列表，确保后续调用使用过滤后的列表 // 更新 DO 对象中的列表，确保后续调用使用过滤后的列表
handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderIds); handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderIdsStr);
List<HandoverTaskOrder> handoverTaskOrders = handoverTaskOrderService.list(new LambdaQueryWrapper<HandoverTaskOrder>() List<HandoverTaskOrder> handoverTaskOrders = handoverTaskOrderService.list(new LambdaQueryWrapper<HandoverTaskOrder>()
.in(HandoverTaskOrder::getHandoverTaskOrderId, handoverTaskOrderIds) .in(HandoverTaskOrder::getHandoverTaskOrderId, handoverTaskOrderIds)
.eq(HandoverTaskOrder::getTaskDistribution, 2) .eq(HandoverTaskOrder::getTaskDistribution, 2)
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+2 -2
View File
@@ -1397,7 +1397,7 @@ public class StockOutOrderDomainService {
handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId()); handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId());
List<Long> ids = new ArrayList<>(); List<Long> ids = new ArrayList<>();
ids.add(handoverTaskOrder.getHandoverTaskOrderId()); ids.add(handoverTaskOrder.getHandoverTaskOrderId());
handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); handoverTaskOrderDO1.setHandoverTaskOrderIds(ids.stream().map(String::valueOf).collect(Collectors.toList()));
DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>() DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
.eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber()) .eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber())
.eq(DeliveTask::getDelFlag, 1)); .eq(DeliveTask::getDelFlag, 1));
@@ -1412,7 +1412,7 @@ public class StockOutOrderDomainService {
HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();
List<Long> handoverTaskOrderId = new ArrayList<>(); List<Long> handoverTaskOrderId = new ArrayList<>();
handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId()); handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId());
handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderId); handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderId.stream().map(String::valueOf).collect(Collectors.toList()));
handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO); handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO);
} }
//出库交接后生成电子签名记录 //出库交接后生成电子签名记录
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java
+26 -26
View File
@@ -131,36 +131,36 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
private Long permissionMenuId; private Long permissionMenuId;
@ApiModelProperty("交接作业单id") @ApiModelProperty("交接作业单id")
private List<Long> handoverTaskOrderIds; private List<String> handoverTaskOrderIds;
/** /**
* 自定义setter方法，支持单个整数和数组两种格式 * 自定义setter方法，支持单个整数和数组两种格式
*/ */
public void setHandoverTaskOrderIds(Object value) { // public void setHandoverTaskOrderIds(Object value) {
if (value == null) { // if (value == null) {
this.handoverTaskOrderIds = null; // this.handoverTaskOrderIds = null;
return; // return;
} // }
//
List<Long> result = new ArrayList<>(); // List<Long> result = new ArrayList<>();
//
if (value instanceof List) { // if (value instanceof List) {
// 如果是列表，遍历并转换 // // 如果是列表，遍历并转换
List<?> list = (List<?>) value; // List<?> list = (List<?>) value;
for (Object item : list) { // for (Object item : list) {
if (item != null) { // if (item != null) {
if (item instanceof Number) { // if (item instanceof Number) {
result.add(((Number) item).longValue()); // result.add(((Number) item).longValue());
} // }
} // }
} // }
} else if (value instanceof Number) { // } else if (value instanceof Number) {
// 如果是单个数字，转换为列表 // // 如果是单个数字，转换为列表
result.add(((Number) value).longValue()); // result.add(((Number) value).longValue());
} // }
//
this.handoverTaskOrderIds = result.isEmpty() ? null : result; // this.handoverTaskOrderIds = result.isEmpty() ? null : result;
} // }
@ApiModelProperty("作业人用户ID") @ApiModelProperty("作业人用户ID")
@Excel(name = "作业人用户ID") @Excel(name = "作业人用户ID")