增加批次商品选择

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

@@ -7,6 +7,8 @@ public class SerialNumber {
 
     private Long materialId;
 
+    private Long depotId;
+
     private String serialNumber;
 
     private String isSell;
@@ -43,6 +45,14 @@ public class SerialNumber {
         this.materialId = materialId;
     }
 
+    public Long getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Long depotId) {
+        this.depotId = depotId;
+    }
+
     public String getSerialNumber() {
         return serialNumber;
     }

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

@@ -28,6 +28,8 @@ public class SerialNumberEx extends SerialNumber{
     /**单据类型（出库入库）*/
     private String depotHeadType;
 
+    private String depotName;
+
     public String getMaterialCode() {
         return materialCode;
     }
@@ -75,4 +77,12 @@ public class SerialNumberEx extends SerialNumber{
     public void setDepotHeadType(String depotHeadType) {
         this.depotHeadType = depotHeadType;
     }
+
+    public String getDepotName() {
+        return depotName;
+    }
+
+    public void setDepotName(String depotName) {
+        this.depotName = depotName;
+    }
 }

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

@@ -225,6 +225,66 @@ public class SerialNumberExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepotIdIsNull() {
+            addCriterion("depot_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIsNotNull() {
+            addCriterion("depot_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdEqualTo(Long value) {
+            addCriterion("depot_id =", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotEqualTo(Long value) {
+            addCriterion("depot_id <>", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThan(Long value) {
+            addCriterion("depot_id >", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("depot_id >=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThan(Long value) {
+            addCriterion("depot_id <", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThanOrEqualTo(Long value) {
+            addCriterion("depot_id <=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIn(List<Long> values) {
+            addCriterion("depot_id in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotIn(List<Long> values) {
+            addCriterion("depot_id not in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdBetween(Long value1, Long value2) {
+            addCriterion("depot_id between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotBetween(Long value1, Long value2) {
+            addCriterion("depot_id not between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
         public Criteria andSerialNumberIsNull() {
             addCriterion("serial_number is null");
             return (Criteria) this;

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

@@ -3,6 +3,7 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.vo.DepotItemStockWarningCount;
 import com.jsh.erp.datasource.vo.DepotItemVo4Stock;
+import com.jsh.erp.datasource.vo.DepotItemVoBatchNumberList;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -128,4 +129,11 @@ public interface DepotItemMapperEx {
             @Param("mId") Long mId,
             @Param("linkNumber") String linkNumber,
             @Param("goToType") String goToType);
+
+    List<DepotItemVoBatchNumberList> getBatchNumberList(
+            @Param("name") String name,
+            @Param("depotId") Long depotId,
+            @Param("barCode") String barCode,
+            @Param("batchNumber") String batchNumber
+            );
 }

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

@@ -1,5 +1,6 @@
 package com.jsh.erp.datasource.mappers;
 
+import com.jsh.erp.datasource.entities.SerialNumber;
 import com.jsh.erp.datasource.entities.SerialNumberEx;
 import org.apache.ibatis.annotations.Param;
 
@@ -62,4 +63,13 @@ public interface SerialNumberMapperEx {
     int batAddSerialNumber(@Param("list") List<SerialNumberEx> list);
 
     int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
+
+    List<SerialNumber> getEnableSerialNumberList(@Param("name") String name,
+                                                 @Param("depotId") Long depotId,
+                                                 @Param("materialId") Long materialId,
+                                                 @Param("offset") Integer offset, @Param("rows") Integer rows);
+
+    Long getEnableSerialNumberCount(@Param("name") String name,
+                                    @Param("depotId") Long depotId,
+                                    @Param("materialId") Long materialId);
 }

jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemVoBatchNumberList.java

@@ -0,0 +1,90 @@
+package com.jsh.erp.datasource.vo;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DepotItemVoBatchNumberList {
+
+    private String id;
+    private String barCode;
+    private String name;
+    private String standard;
+    private String model;
+    private String batchNumber;
+    private Date expirationDate;
+    private String expirationDateStr;
+    private BigDecimal totalNum;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public Date getExpirationDate() {
+        return expirationDate;
+    }
+
+    public void setExpirationDate(Date expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+
+    public String getExpirationDateStr() {
+        return expirationDateStr;
+    }
+
+    public void setExpirationDateStr(String expirationDateStr) {
+        this.expirationDateStr = expirationDateStr;
+    }
+
+    public BigDecimal getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(BigDecimal totalNum) {
+        this.totalNum = totalNum;
+    }
+}