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-15 14:36:19 +08:00
parent 4091f20e7a
commit 7326407d13
1 changed files with 59 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/stockOutOrder/service/StockOutOrderDomainService.java
+59 -18
View File
@@ -74,6 +74,11 @@ import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService;
import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService; import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService;
import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO; import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO;
import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService; import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService;
import com.mhd.wms.domain.reviewOrder.entity.ReviewMaterialDetail;
import com.mhd.wms.domain.reviewOrder.entity.ReviewOrder;
import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewMaterialDetailMapper;
import com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewOrderMapper;
import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO;
import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO; import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO;
import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO; import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO;
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
@@ -165,6 +170,12 @@ public class StockOutOrderDomainService {
private PickingOrderApplicationService pickingOrderApplicationService; private PickingOrderApplicationService pickingOrderApplicationService;
@Autowired @Autowired
private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService; private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService;
@Autowired
private ReviewOrderApplicationService reviewOrderApplicationService;
@Autowired
private ReviewOrderMapper reviewOrderMapper;
@Autowired
private ReviewMaterialDetailMapper reviewMaterialDetailMapper;
/** /**
* 分页查询出库单列表 * 分页查询出库单列表
@@ -969,26 +980,56 @@ public class StockOutOrderDomainService {
//复核 //复核
ReviewOrderDO reviewOrderDO = new ReviewOrderDO(); // ReviewOrderDO reviewOrderDO = new ReviewOrderDO();
List<OutMaterialDetailDO> materialDetailList = stockOutOrderDO.getMaterialDetailList(); // List<OutMaterialDetailDO> materialDetailList = stockOutOrderDO.getMaterialDetailList();
if (materialDetailList != null && materialDetailList.size() > 0) { // if (materialDetailList != null && materialDetailList.size() > 0) {
for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) { // for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) {
Long uniqueId = outMaterialDetailDO.getUniqueId(); // Long uniqueId = outMaterialDetailDO.getUniqueId();
PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper<PickingMaterialDetail>().lambda() // PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper<PickingMaterialDetail>().lambda()
.eq(PickingMaterialDetail::getOutUniqueId, uniqueId) // .eq(PickingMaterialDetail::getOutUniqueId, uniqueId)
.eq(PickingMaterialDetail::getDelFlag, 1), false); // .eq(PickingMaterialDetail::getDelFlag, 1), false);
if (pickingMaterialDetail != null) { // if (pickingMaterialDetail != null) {
outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity()); // outMaterialDetailDO.setActualQuantity(pickingMaterialDetail.getPickingQuantity());
outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea()); // outMaterialDetailDO.setCheckArea(pickingMaterialDetail.getTotalArea());
outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume()); // outMaterialDetailDO.setCheckVolume(pickingMaterialDetail.getTotalVolume());
outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight()); // outMaterialDetailDO.setCheckNetWeight(pickingMaterialDetail.getTotalNetWeight());
outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight()); // outMaterialDetailDO.setCheckGrossWeight(pickingMaterialDetail.getTotalGrossWeight());
} // }
// }
// }
// stockOutOrderDO.setMaterialDetailList(materialDetailList);
// batchCheck(stockOutOrderDO);
// checkConfirm(stockOutOrderDO);
ReviewOrderDO cmd1 = new ReviewOrderDO();
List<ReviewOrder> reviewOrders = reviewOrderMapper.selectList(new QueryWrapper<ReviewOrder>().lambda()
.eq(ReviewOrder::getOutOrderId, stockOutOrderDO.getOutOrderId())
.eq(ReviewOrder::getDelFlag, 1));
if (reviewOrders != null && reviewOrders.size() > 0) {
ReviewOrder reviewOrder = reviewOrders.get(0);
BeanUtils.copyProperties(reviewOrder,cmd1);
List<ReviewMaterialDetailPO> details = new ArrayList<>();
for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()) {
ReviewMaterialDetailPO detailPO = new ReviewMaterialDetailPO();
Long materialDetailId = outMaterialDetailDO.getMaterialDetailId();
ReviewMaterialDetail reviewMaterialDetailPO = reviewMaterialDetailMapper.selectOne(new QueryWrapper<ReviewMaterialDetail>().lambda()
.eq(ReviewMaterialDetail::getMaterialDetailId, materialDetailId)
.eq(ReviewMaterialDetail::getDelFlag, 1));
reviewMaterialDetailPO.setReviewedQty(BigDecimal.ZERO);
reviewMaterialDetailPO.setReviewQtyEa(reviewMaterialDetailPO.getPendingReviewQty());
reviewMaterialDetailPO.setVolumeCbm(outMaterialDetailDO.getOutVolume());
reviewMaterialDetailPO.setNetWeightKg(outMaterialDetailDO.getOutWeight());
reviewMaterialDetailPO.setGrossWeightKg(outMaterialDetailDO.getOutVolume());
BeanUtils.copyProperties(reviewMaterialDetailPO, detailPO);
details.add(detailPO);
} }
cmd1.setDetails(details);
} }
stockOutOrderDO.setMaterialDetailList(materialDetailList);
batchCheck(stockOutOrderDO);
checkConfirm(stockOutOrderDO); reviewOrderApplicationService.batchCheck(cmd1);
ReviewOrderDO cmd2 = new ReviewOrderDO();
cmd2.setReviewOrderId(cmd1.getReviewOrderId());
reviewOrderApplicationService.checkConfirm(cmd2);
//交接 //交接