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

PDA复核内容修改

Browse Source
This commit is contained in:
秦鸿展
2026-04-10 14:46:28 +08:00
parent bfb3c92678
commit 69543777da
6 changed files with 181 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+8 -2
View File
@@ -171,8 +171,14 @@ public class HandoverTaskOrderDomainService {
detail.setMaterialCode(omd.getMaterialCode() != null ? omd.getMaterialCode() : omd.getMaterialNo());
detail.setMaterialName(omd.getMaterialName() != null ? omd.getMaterialName() : omd.getCommodityName());
detail.setBarCode(omd.getBarCode());
detail.setWeightLimit(omd.getWeightLimit());
detail.setVolumeLimit(omd.getVolumeLimit());
// 需要复核时：交接展示以出库明细上的复核计量为准（完成复核时由复核单同步写入 check_*）
if (Integer.valueOf(1).equals(review)) {
detail.setWeightLimit(omd.getCheckNetWeight() != null ? omd.getCheckNetWeight() : omd.getWeightLimit());
detail.setVolumeLimit(omd.getCheckVolume() != null ? omd.getCheckVolume() : omd.getVolumeLimit());
} else {
detail.setWeightLimit(omd.getWeightLimit());
detail.setVolumeLimit(omd.getVolumeLimit());
}
detail.setQuantity(omd.getQuantity());
detail.setPickingQuantity(pickQty);
detail.setCheckQuantity(handoverQuantity);
mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/repository/persistence/InOrderAbnormalImpl.java
+45 -1
View File
@@ -14,14 +14,19 @@ import com.mhd.wms.domain.inOrderAbnormal.repository.po.InOrderAbnormalPO;
import com.mhd.wms.domain.inOrderAbnormal.repository.todo.InOrderAbnormalBaseDO;
import com.mhd.wms.domain.inOrderAbnormal.repository.todo.InOrderAbnormalDO;
import com.mhd.wms.domain.receiptMaterialDetail.entity.ReceiptMaterialDetail;
import com.mhd.wms.domain.receiptMaterialDetail.repository.facade.IReceiptMaterialDetailService;
import com.mhd.wms.domain.receiptMaterialDetail.repository.mapper.ReceiptMaterialDetailMapper;
import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO;
import com.mhd.wms.domain.shelfMaterialDetail.entity.ShelfMaterialDetail;
import com.mhd.wms.domain.shelfMaterialDetail.repository.facade.IShelfMaterialDetailService;
import com.mhd.wms.domain.shelfMaterialDetail.repository.mapper.ShelfMaterialDetailMapper;
import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -42,6 +47,10 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
private ReceiptMaterialDetailMapper receiptMaterialDetailMapper;
@Autowired
private ShelfMaterialDetailMapper shelfMaterialDetailMapper;
@Autowired
private IReceiptMaterialDetailService receiptMaterialDetailService;
@Autowired
private IShelfMaterialDetailService shelfMaterialDetailService;
/**
* 查询入库异常单列表
@@ -98,7 +107,42 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
if (CollectionUtils.isEmpty(inOrderAbnormalPOList)){
throw new ServiceException("入库异常单不存在");
}
return inOrderAbnormalPOList.get(0);
InOrderAbnormalPO inOrderAbnormalPO = inOrderAbnormalPOList.get(0);
fillMaterialDetails(inOrderAbnormalPO);
return inOrderAbnormalPO;
}
/**
* 按异常类型加载关联收货/上架明细（整单行）
*/
private void fillMaterialDetails(InOrderAbnormalPO po) {
if (po == null) {
return;
}
Integer type = po.getType();
if (Integer.valueOf(1).equals(type)) {
if (StringUtils.hasText(po.getReceiptOrderNumber())) {
ReceiptMaterialDetailDO detailDO = new ReceiptMaterialDetailDO();
detailDO.setReceiptOrderNumber(po.getReceiptOrderNumber());
po.setReceiptMaterialDetailList(receiptMaterialDetailService.queryList(detailDO));
}
} else if (Integer.valueOf(2).equals(type)) {
if (StringUtils.hasText(po.getShelfOrderNumber())) {
ShelfMaterialDetailDO detailDO = new ShelfMaterialDetailDO();
detailDO.setShelfOrderNumber(po.getShelfOrderNumber());
po.setShelfMaterialDetailList(shelfMaterialDetailService.queryList(detailDO));
}
} else {
if (StringUtils.hasText(po.getReceiptOrderNumber())) {
ReceiptMaterialDetailDO detailDO = new ReceiptMaterialDetailDO();
detailDO.setReceiptOrderNumber(po.getReceiptOrderNumber());
po.setReceiptMaterialDetailList(receiptMaterialDetailService.queryList(detailDO));
} else if (StringUtils.hasText(po.getShelfOrderNumber())) {
ShelfMaterialDetailDO detailDO = new ShelfMaterialDetailDO();
detailDO.setShelfOrderNumber(po.getShelfOrderNumber());
po.setShelfMaterialDetailList(shelfMaterialDetailService.queryList(detailDO));
}
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/todo/ReviewOrderDO.java
+2
View File
@@ -1,5 +1,6 @@
package com.mhd.wms.domain.reviewOrder.repository.todo;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.mhd.common.core.web.domain.BaseVOEntity;
import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO;
import io.swagger.annotations.ApiModelProperty;
@@ -62,6 +63,7 @@ public class ReviewOrderDO extends BaseVOEntity {
private String checkOperatorsName;
@ApiModelProperty("复核明细列表（用于批量复核/取消复核）")
@JsonAlias({"materialDetailList"})
private List<ReviewMaterialDetailPO> details;
@ApiModelProperty("PDA 列表 Tab：2=历史(已复核)，其它=待办(待复核/复核中)")