移库

src/main/java/com/zg/project/wisdom/domain/MoveRecord.java

@@ -1,11 +1,13 @@
 package com.zg.project.wisdom.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.zg.framework.web.domain.BaseEntity;
 import com.zg.framework.aspectj.lang.annotation.Excel;
 import com.zg.project.wisdom.config.BigDecimalSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -96,14 +98,26 @@ public class MoveRecord extends BaseEntity {
     /** 项目描述 */
     @Excel(name = "项目描述")
     private String xmMs;
-
+    /** 物料号 */
+    @Excel(name = "物料号")
+    private String wlNo;
     /** 物料描述 */
     @Excel(name = "物料描述")
     private String wlMs;
-
+    /** SAP订单编号 */
+    @Excel(name = "SAP订单编号")
+    private String sapNo;
     /** 供应商名称 */
     @Excel(name = "供应商名称")
     private String gysMc;
+    /** 入库 / 出库开始时间（查询用） */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endDate;
 
     // ==================== Getter / Setter ====================
 
@@ -266,6 +280,13 @@ public class MoveRecord extends BaseEntity {
     public void setXmNo(String xmNo) {
         this.xmNo = xmNo;
     }
+    public String getSapNo() {
+        return sapNo;
+    }
+
+    public void setSapNo(String sapNo) {
+        this.sapNo = sapNo;
+    }
 
     public String getXmMs() {
         return xmMs;
@@ -282,6 +303,13 @@ public class MoveRecord extends BaseEntity {
     public void setWlMs(String wlMs) {
         this.wlMs = wlMs;
     }
+    public String getWlNo() {
+        return wlNo;
+    }
+
+    public void setWlNo(String wlNo) {
+        this.wlNo = wlNo;
+    }
 
     public String getGysMc() {
         return gysMc;
@@ -290,6 +318,21 @@ public class MoveRecord extends BaseEntity {
     public void setGysMc(String gysMc) {
         this.gysMc = gysMc;
     }
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 
     @Override
     public String toString() {
@@ -310,7 +353,11 @@ public class MoveRecord extends BaseEntity {
                 .append("movedBy", getMovedBy())
                 .append("movedByName", getMovedByName())
                 .append("movedAt", getMovedAt())
+                .append("wlNo", getWlNo())
+                .append("sapNo", getSapNo())
                 .append("isDelete", getIsDelete())
+                .append("startDate", startDate)
+                .append("endDate", endDate)
                 .toString();
     }
 }

src/main/resources/mybatis/wisdom/MoveRecordMapper.xml

@@ -49,6 +49,8 @@
         <result property="xmNo" column="xm_no"/>
         <result property="xmMs" column="xm_ms"/>
         <result property="wlMs" column="wl_ms"/>
+        <result property="wlNo" column="wl_no"/>
+        <result property="sapNo" column="sap_no"/>
         <result property="gysMc" column="gys_mc"/>
     </resultMap>
 
@@ -141,6 +143,8 @@
         ri.xm_no,
         ri.xm_ms,
         ri.wl_ms,
+        ri.wl_no,
+        ri.sap_no,
         ri.gys_mc,
         wi1.warehouse_name AS from_cangku_name,
         wi2.warehouse_name AS to_cangku_name
@@ -163,9 +167,21 @@
             <if test="xmNo != null and xmNo != ''">
                 AND ri.xm_no = #{xmNo}
             </if>
+            <if test="wlNo != null and wlNo != ''">
+                AND ri.wl_no = #{wlNo}
+            </if>
+            <if test="sapNo != null and sapNo != ''">
+                AND ri.sap_no = #{sapNo}
+            </if>
             <if test="moveReason != null and moveReason != ''">
                 AND mr.move_reason LIKE concat('%', #{moveReason}, '%')
             </if>
+            <if test="startDate != null">
+                AND mr.moved_at &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND mr.moved_at &lt;= #{endDate}
+            </if>
         </where>
         ORDER BY mr.create_time DESC
     </select>