From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改

---
 consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java |  177 +++++-----------------------------------------------------
 1 files changed, 17 insertions(+), 160 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
index d014bd5..42581d6 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormScrappedParam.java
@@ -1,190 +1,47 @@
 package com.consum.base.pojo;
 
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.walker.web.param.ParamRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
-public class LWhFormScrappedParam extends ParamRequest {
-
-    //鏂板鍙傛暟
+@Data
+@ApiModel(value = "鏂板鎶ュ簾鍗曚俊鎭�")
+public class LWhFormScrappedParam {
 
     /**
      * 鏈烘瀯id
      */
+    @ApiModelProperty(value = "鏈烘瀯id")
     private Long agencyId;
+
+    @ApiModelProperty(value = "閮ㄩ棬id")
+    private Long departmentId;
+
     /**
      * 浠撳簱缂栧彿
      */
+    @ApiModelProperty(value = "浠撳簱缂栧彿")
     private Long warehouseId;
     /**
      * 鎿嶄綔浜�
      */
+    @ApiModelProperty(value = "鎿嶄綔浜�")
     private Long operatorId;
     /**
      * 鎶ュ簾鏃堕棿
      */
+    @ApiModelProperty(value = "鎶ュ簾鏃堕棿")
     private Long dealTime;
     /**
      * 闄勪欢
      */
+    @ApiModelProperty(value = "闄勪欢")
     private String uploadFiles;
-    /**
-     * 鐗╁搧id
-     */
-    private Long baseGoodsTemplateId;
-    /**
-     * 鎶ュ簾鍗曠墿鍝�
-     */
-    private List<LWhFormScrappedGoodsParams> scrappedGoodsList;
 
-    //鏌ヨ鍙傛暟
+    @ApiModelProperty(value = "鎶ュ簾鍟嗗搧淇℃伅")
+    private List<LWhFormScrappedGoodsInfoParam> scrappedGoodsInfo;
 
-    /**
-     * 鎶ュ簾鍗曞彿
-     */
-    private String businessFormCode;
-    /**
-     * 鐗╁搧妯$増鍚嶇О
-     */
-    private String goodsTemplateName;
-    /**
-     * 鎶ュ簾鏃堕棿 寮�濮�
-     */
-    private Long dealTimeStart;
-    /**
-     * 鎶ュ簾鏃堕棿 缁撴潫
-     */
-    private Long dealTimeEnd;
-    /**
-     * 瑙勬牸鍨嬪彿id
-     */
-    private Long baseGoodsModelsId;
-    /**
-     * 鍒涘缓浜�
-     */
-    private String operatorName;
 
-    private Integer pageSize = 10;
-    private Integer pageNum = 1;
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public Integer getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-
-    public Long getBaseGoodsModelsId() {
-        return baseGoodsModelsId;
-    }
-
-    public void setBaseGoodsModelsId(Long baseGoodsModelsId) {
-        this.baseGoodsModelsId = baseGoodsModelsId;
-    }
-
-    public String getBusinessFormCode() {
-        return businessFormCode;
-    }
-
-    public void setBusinessFormCode(String businessFormCode) {
-        this.businessFormCode = businessFormCode;
-    }
-
-    public String getGoodsTemplateName() {
-        return goodsTemplateName;
-    }
-
-    public void setGoodsTemplateName(String goodsTemplateName) {
-        this.goodsTemplateName = goodsTemplateName;
-    }
-
-    public Long getDealTimeStart() {
-        return dealTimeStart;
-    }
-
-    public void setDealTimeStart(Long dealTimeStart) {
-        this.dealTimeStart = dealTimeStart;
-    }
-
-    public Long getDealTimeEnd() {
-        return dealTimeEnd;
-    }
-
-    public void setDealTimeEnd(Long dealTimeEnd) {
-        this.dealTimeEnd = dealTimeEnd;
-    }
-
-    public Long getBaseGoodsTemplateId() {
-        return baseGoodsTemplateId;
-    }
-
-    public void setBaseGoodsTemplateId(Long baseGoodsTemplateId) {
-        this.baseGoodsTemplateId = baseGoodsTemplateId;
-    }
-
-    public Long getAgencyId() {
-        return agencyId;
-    }
-
-    public void setAgencyId(Long agencyId) {
-        this.agencyId = agencyId;
-    }
-
-    public Long getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(Long warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public Long getOperatorId() {
-        return operatorId;
-    }
-
-    public void setOperatorId(Long operatorId) {
-        this.operatorId = operatorId;
-    }
-
-    public Long getDealTime() {
-        return dealTime;
-    }
-
-    public void setDealTime(Long dealTime) {
-        this.dealTime = dealTime;
-    }
-
-    public String getUploadFiles() {
-        return uploadFiles;
-    }
-
-    public void setUploadFiles(String uploadFiles) {
-        this.uploadFiles = uploadFiles;
-    }
-
-    public List<LWhFormScrappedGoodsParams> getScrappedGoodsList() {
-        return scrappedGoodsList;
-    }
-
-    public void setScrappedGoodsList(List<LWhFormScrappedGoodsParams> scrappedGoodsList) {
-        this.scrappedGoodsList = scrappedGoodsList;
-    }
 }

--
Gitblit v1.9.1