复核页面修改调整

2026-04-07 15:59:40 +08:00
parent d3870556af
commit cf5f955868
5 changed files with 513 additions and 0 deletions
@@ -218,6 +218,37 @@ public class ReviewOrderDomainService {
            }
            if (outMd != null) {
                d.setMaterialDetailId(outMd.getMaterialDetailId());
+                // 批次属性：拣货明细未带出时，从出库明细兜底（项目内同口径）
+                if (d.getProductionDate() == null) {
+                    d.setProductionDate(outMd.getProductionDate());
+                }
+                if (d.getExpiryDate() == null) {
+                    d.setExpiryDate(outMd.getExpiryDate());
+                }
+                if (d.getInventoryDate() == null) {
+                    d.setInventoryDate(outMd.getInventoryDate());
+                }
+                if (d.getBatchRefNo() == null) {
+                    d.setBatchRefNo(outMd.getBatchRefNo());
+                }
+                if (d.getSheetRefNo() == null) {
+                    d.setSheetRefNo(outMd.getSheetRefNo());
+                }
+                if (d.getBoxPalletNo() == null) {
+                    d.setBoxPalletNo(outMd.getBoxPalletNo());
+                }
+                if (d.getExtAttr1() == null) {
+                    d.setExtAttr1(outMd.getExtAttr1());
+                }
+                if (d.getExtAttr2() == null) {
+                    d.setExtAttr2(outMd.getExtAttr2());
+                }
+                if (d.getExtAttr3() == null) {
+                    d.setExtAttr3(outMd.getExtAttr3());
+                }
+                if (d.getExtAttr4() == null) {
+                    d.setExtAttr4(outMd.getExtAttr4());
+                }
            }
        }
        return d;
@@ -1,9 +1,12 @@
 package com.mhd.wms.domain.reviewOrder.repository.todo;

 import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * 复核单列表查询条件（对应表 review_order）
 */
@@ -48,4 +51,10 @@ public class ReviewOrderDO extends BaseVOEntity {

    @ApiModelProperty("接收时间止")
    private String receiveTimeEnd;
+
+    @ApiModelProperty("复核单ID集合")
+    private List<Long> reviewOrderIds;
+
+    @ApiModelProperty("复核明细列表（用于批量复核/取消复核）")
+    private List<ReviewMaterialDetailPO> details;
 }