复核页面调整修改

2026-04-07 10:53:26 +08:00
parent 7f32271adc
commit 65ae591f86
15 changed files with 1138 additions and 0 deletions
@@ -0,0 +1,20 @@
+package com.mhd.wms.interfaces.assember.reviewOrder;
+
+import com.mhd.common.core.utils.IgnoreNullUtil;
+import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO;
+import com.mhd.wms.interfaces.dto.reviewOrder.ReviewOrderDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * 复核单 DTO ↔ DO
+ */
+@Component
+public class ReviewOrderAssembler {
+
+    public ReviewOrderDO toDO(ReviewOrderDTO dto) {
+        ReviewOrderDO reviewOrderDO = new ReviewOrderDO();
+        BeanUtils.copyProperties(dto, reviewOrderDO, IgnoreNullUtil.getNullPropertyNames(dto));
+        return reviewOrderDO;
+    }
+}
@@ -0,0 +1,51 @@
+package com.mhd.wms.interfaces.dto.reviewOrder;
+
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 复核单查询/入参 DTO（列表条件与主键）
+ */
+@Data
+public class ReviewOrderDTO extends BaseVOEntity {
+
+    @ApiModelProperty("复核单主键")
+    private Long reviewOrderId;
+
+    @ApiModelProperty("复核单号（模糊）")
+    private String reviewOrderNumber;
+
+    @ApiModelProperty("出库单号（模糊）")
+    private String outOrderNumber;
+
+    @ApiModelProperty("复核状态：1-待复核 2-复核中 3-已复核")
+    private Integer reviewStatus;
+
+    @ApiModelProperty("复核下发：0-否 1-是")
+    private String issuedFlag;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty("一级组织ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("客户名称（模糊）")
+    private String customerName;
+
+    @ApiModelProperty("创建时间起 yyyy-MM-dd")
+    private String createTimeStart;
+
+    @ApiModelProperty("创建时间止 yyyy-MM-dd")
+    private String createTimeEnd;
+
+    @ApiModelProperty("接收时间起 yyyy-MM-dd")
+    private String receiveTimeStart;
+
+    @ApiModelProperty("接收时间止 yyyy-MM-dd")
+    private String receiveTimeEnd;
+}
@@ -0,0 +1,26 @@
+package com.mhd.wms.interfaces.dto.reviewOrder;
+
+import com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO;
+import com.mhd.wms.domain.reviewOrder.repository.po.ReviewOrderPO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 复核单详情：主表 + 明细行
+ */
+@Data
+@ApiModel("复核单详情")
+public class ReviewOrderDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("复核单头")
+    private ReviewOrderPO header;
+
+    @ApiModelProperty("复核明细列表")
+    private List<ReviewMaterialDetailPO> details;
+}
@@ -0,0 +1,54 @@
+package com.mhd.wms.interfaces.facadeApi.reviewOrder;
+
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.wms.application.service.reviewOrder.ReviewOrderApplicationService;
+import com.mhd.wms.domain.reviewOrder.repository.po.ReviewOrderPO;
+import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO;
+import com.mhd.wms.interfaces.assember.reviewOrder.ReviewOrderAssembler;
+import com.mhd.wms.interfaces.dto.reviewOrder.ReviewOrderDTO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * PC 复核单接口：列表、详情（头+明细）
+ */
+@RestController
+@RequestMapping("/reviewOrderApi")
+public class ReviewOrderApi extends BaseController {
+
+    @Autowired
+    private ReviewOrderApplicationService reviewOrderApplicationService;
+
+    @Resource
+    private ReviewOrderAssembler reviewOrderAssembler;
+
+    @ApiOperation("复核单分页列表")
+    @GetMapping("/list")
+    public TableDataInfo list(ReviewOrderDTO reviewOrderDTO) {
+        ReviewOrderDO query = reviewOrderAssembler.toDO(reviewOrderDTO);
+        startPage();
+        List<ReviewOrderPO> list = reviewOrderApplicationService.queryList(query);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("复核单详情（按主键，含明细）")
+    @GetMapping("/detail/{reviewOrderId}")
+    public AjaxResult detail(@PathVariable("reviewOrderId") Long reviewOrderId) {
+        return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderId(reviewOrderId));
+    }
+
+    @ApiOperation("复核单详情（按复核单号，含明细）")
+    @GetMapping("/detailByNumber/{reviewOrderNumber}")
+    public AjaxResult detailByNumber(@PathVariable("reviewOrderNumber") String reviewOrderNumber) {
+        return AjaxResult.success(reviewOrderApplicationService.getDetailByReviewOrderNumber(reviewOrderNumber));
+    }
+}