优化序列号和批号选择列表的接口

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java

@@ -1,5 +1,7 @@
 package com.jsh.erp.datasource.entities;
 
+import java.util.Date;
+
 /**
  * Description
  *
@@ -30,6 +32,10 @@ public class SerialNumberEx extends SerialNumber{
 
     private String depotName;
 
+    private String createTimeStr;
+
+    private String updateTimeStr;
+
     public String getMaterialCode() {
         return materialCode;
     }
@@ -85,4 +91,20 @@ public class SerialNumberEx extends SerialNumber{
     public void setDepotName(String depotName) {
         this.depotName = depotName;
     }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
+    public String getUpdateTimeStr() {
+        return updateTimeStr;
+    }
+
+    public void setUpdateTimeStr(String updateTimeStr) {
+        this.updateTimeStr = updateTimeStr;
+    }
 }

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -163,6 +163,7 @@ public interface DepotItemMapperEx {
             @Param("goToType") String goToType);
 
     List<DepotItemVoBatchNumberList> getBatchNumberList(
+            @Param("number") String number,
             @Param("name") String name,
             @Param("depotId") Long depotId,
             @Param("barCode") String barCode,

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java

@@ -44,12 +44,14 @@ public interface SerialNumberMapperEx {
 
     int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 
-    List<SerialNumber> getEnableSerialNumberList(@Param("name") String name,
+    List<SerialNumberEx> getEnableSerialNumberList(@Param("number") String number,
+                                                 @Param("name") String name,
                                                  @Param("depotId") Long depotId,
                                                  @Param("barCode") String barCode,
                                                  @Param("offset") Integer offset, @Param("rows") Integer rows);
 
-    Long getEnableSerialNumberCount(@Param("name") String name,
+    Long getEnableSerialNumberCount(@Param("number") String number,
+                                    @Param("name") String name,
                                     @Param("depotId") Long depotId,
                                     @Param("barCode") String barCode);
 }