添加出库时开启序列号的商品强制附加使用序列号

2019-01-29 10:33:22 +08:00
parent b55e9d1597
commit b08d349b45
31 changed files with 1521 additions and 567 deletions
--- a/src/main/java/com/jsh/erp/datasource/entities/Material.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/Material.java
@@ -190,7 +190,7 @@ public class Material {
     * 2019-01-21新增字段enableSerialNumber
     *是否开启序列号
     * */
-    private Boolean enableSerialNumber;
+    private String enableSerialNumber;

    /**
     * This method was generated by MyBatis Generator.
@@ -744,11 +744,11 @@ public class Material {
        this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
    }

-    public Boolean getEnableSerialNumber() {
+    public String getEnableSerialNumber() {
        return enableSerialNumber;
    }

-    public void setEnableSerialNumber(Boolean enableSerialNumber) {
+    public void setEnableSerialNumber(String enableSerialNumber) {
        this.enableSerialNumber = enableSerialNumber;
    }
 }
--- a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
@@ -1704,6 +1704,72 @@ public class MaterialExample {
            addCriterion("OtherField3 not between", value1, value2, "otherfield3");
            return (Criteria) this;
        }
+        public Criteria andEnableSerialNumberIsNull() {
+            addCriterion("enableSerialNumber is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberIsNotNull() {
+            addCriterion("enableSerialNumber is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberEqualTo(String value) {
+            addCriterion("enableSerialNumber =", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberNotEqualTo(String value) {
+            addCriterion("enableSerialNumber <>", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberGreaterThan(String value) {
+            addCriterion("enableSerialNumber >", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("enableSerialNumber >=", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberLessThan(String value) {
+            addCriterion("enableSerialNumber <", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberLessThanOrEqualTo(String value) {
+            addCriterion("enableSerialNumber <=", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+        public Criteria andEnableSerialNumberLike(String value) {
+            addCriterion("enableSerialNumber like", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+        public Criteria andEnableSerialNumberNotLike(String value) {
+            addCriterion("enableSerialNumber not like", value, "enableSerialNumber");
+            return (Criteria) this;
+        }
+        public Criteria andEnableSerialNumberIn(List<String> values) {
+            addCriterion("enableSerialNumber in", values, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberNotIn(List<String> values) {
+            addCriterion("enableSerialNumber not in", values, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberBetween(String value1, String value2) {
+            addCriterion("enableSerialNumber between", value1, value2, "enableSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableSerialNumberNotBetween(String value1, String value2) {
+            addCriterion("enableSerialNumber not between", value1, value2, "enableSerialNumber");
+            return (Criteria) this;
+        }
    }

    /**
--- a/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
@@ -59,7 +59,7 @@ public class MaterialVo4Unit {
     * 2019-01-21新增字段enableSerialNumber
     *是否开启序列号
     * */
-    private Boolean enableSerialNumber;
+    private String enableSerialNumber;

    public Long getId() {
        return id;
@@ -269,11 +269,11 @@ public class MaterialVo4Unit {
        this.materialOther = materialOther;
    }

-    public Boolean getEnableSerialNumber() {
+    public String getEnableSerialNumber() {
        return enableSerialNumber;
    }

-    public void setEnableSerialNumber(Boolean enableSerialNumber) {
+    public void setEnableSerialNumber(String enableSerialNumber) {
        this.enableSerialNumber = enableSerialNumber;
    }
 }
--- a/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
@@ -33,7 +33,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    private Boolean isSell;
+    private String isSell;

    /**
     * This field was generated by MyBatis Generator.
@@ -49,7 +49,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    private Boolean deleteFlag;
+    private String deleteFlag;

    /**
     * This field was generated by MyBatis Generator.
@@ -82,6 +82,10 @@ public class SerialNumber {
     * @mbggenerated
     */
    private Long updater;
+    /**
+     * 单据主表id，用于跟踪序列号流向
+     * */
+    private Long depotheadId;

    /**
     * This method was generated by MyBatis Generator.
@@ -163,7 +167,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    public Boolean getIsSell() {
+    public String getIsSell() {
        return isSell;
    }

@@ -175,7 +179,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    public void setIsSell(Boolean isSell) {
+    public void setIsSell(String isSell) {
        this.isSell = isSell;
    }

@@ -211,7 +215,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    public Boolean getDeleteFlag() {
+    public String getDeleteFlag() {
        return deleteFlag;
    }

@@ -223,7 +227,7 @@ public class SerialNumber {
     *
     * @mbggenerated
     */
-    public void setDeleteFlag(Boolean deleteFlag) {
+    public void setDeleteFlag(String deleteFlag) {
        this.deleteFlag = deleteFlag;
    }

@@ -322,4 +326,13 @@ public class SerialNumber {
    public void setUpdater(Long updater) {
        this.updater = updater;
    }
+
+
+    public Long getDepotheadId() {
+        return depotheadId;
+    }
+
+    public void setDepotheadId(Long depotheadId) {
+        this.depotheadId = depotheadId;
+    }
 }
--- a/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
@@ -395,52 +395,61 @@ public class SerialNumberExample {
            return (Criteria) this;
        }

-        public Criteria andIsSellEqualTo(Boolean value) {
+        public Criteria andIsSellEqualTo(String value) {
            addCriterion("is_Sell =", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellNotEqualTo(Boolean value) {
+        public Criteria andIsSellNotEqualTo(String value) {
            addCriterion("is_Sell <>", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellGreaterThan(Boolean value) {
+        public Criteria andIsSellGreaterThan(String value) {
            addCriterion("is_Sell >", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellGreaterThanOrEqualTo(Boolean value) {
+        public Criteria andIsSellGreaterThanOrEqualTo(String value) {
            addCriterion("is_Sell >=", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellLessThan(Boolean value) {
+        public Criteria andIsSellLessThan(String value) {
            addCriterion("is_Sell <", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellLessThanOrEqualTo(Boolean value) {
+        public Criteria andIsSellLessThanOrEqualTo(String value) {
            addCriterion("is_Sell <=", value, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellIn(List<Boolean> values) {
+        public Criteria andIsSellLike(String value) {
+            addCriterion("isSell like", value, "isSell");
+            return (Criteria) this;
+        }
+        public Criteria andIsSellNotLike(String value) {
+            addCriterion("isSell not like", value, "isSell");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSellIn(List<String> values) {
            addCriterion("is_Sell in", values, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellNotIn(List<Boolean> values) {
+        public Criteria andIsSellNotIn(List<String> values) {
            addCriterion("is_Sell not in", values, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellBetween(Boolean value1, Boolean value2) {
+        public Criteria andIsSellBetween(String value1, String value2) {
            addCriterion("is_Sell between", value1, value2, "isSell");
            return (Criteria) this;
        }

-        public Criteria andIsSellNotBetween(Boolean value1, Boolean value2) {
+        public Criteria andIsSellNotBetween(String value1, String value2) {
            addCriterion("is_Sell not between", value1, value2, "isSell");
            return (Criteria) this;
        }
@@ -525,52 +534,59 @@ public class SerialNumberExample {
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagEqualTo(Boolean value) {
+        public Criteria andDeleteFlagEqualTo(String value) {
            addCriterion("delete_Flag =", value, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagNotEqualTo(Boolean value) {
+        public Criteria andDeleteFlagNotEqualTo(String value) {
            addCriterion("delete_Flag <>", value, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagGreaterThan(Boolean value) {
+        public Criteria andDeleteFlagGreaterThan(String value) {
            addCriterion("delete_Flag >", value, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagGreaterThanOrEqualTo(Boolean value) {
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
            addCriterion("delete_Flag >=", value, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagLessThan(Boolean value) {
+        public Criteria andDeleteFlagLessThan(String value) {
            addCriterion("delete_Flag <", value, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagLessThanOrEqualTo(Boolean value) {
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
            addCriterion("delete_Flag <=", value, "deleteFlag");
            return (Criteria) this;
        }
-
-        public Criteria andDeleteFlagIn(List<Boolean> values) {
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("deleteFlag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("deleteFlag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+        public Criteria andDeleteFlagIn(List<String> values) {
            addCriterion("delete_Flag in", values, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagNotIn(List<Boolean> values) {
+        public Criteria andDeleteFlagNotIn(List<String> values) {
            addCriterion("delete_Flag not in", values, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagBetween(Boolean value1, Boolean value2) {
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
            return (Criteria) this;
        }

-        public Criteria andDeleteFlagNotBetween(Boolean value1, Boolean value2) {
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
            return (Criteria) this;
        }
@@ -814,6 +830,68 @@ public class SerialNumberExample {
            addCriterion("updater not between", value1, value2, "updater");
            return (Criteria) this;
        }
+        public Criteria andDepotheadIdIsNull() {
+            addCriterion("depotheadId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdIsNotNull() {
+            addCriterion("depotheadId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdEqualTo(Long value) {
+            addCriterion("depotheadId =", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdNotEqualTo(Long value) {
+            addCriterion("depotheadId <>", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdGreaterThan(Long value) {
+            addCriterion("depotheadId >", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("depotheadId >=", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdLessThan(Long value) {
+            addCriterion("depotheadId <", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
+            addCriterion("depotheadId <=", value, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdIn(List<Long> values) {
+            addCriterion("depotheadId in", values, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdNotIn(List<Long> values) {
+            addCriterion("depotheadId not in", values, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdBetween(Long value1, Long value2) {
+            addCriterion("depotheadId between", value1, value2, "depotheadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
+            addCriterion("depotheadId not between", value1, value2, "depotheadId");
+            return (Criteria) this;
+        }
+
+
+
    }

    /**
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
@@ -101,87 +101,6 @@ public interface DepotHeadMapper {
     */
    int updateByPrimaryKey(DepotHead record);

-    List<DepotHeadVo4List> selectByConditionDepotHead(
-            @Param("type") String type,
-            @Param("subType") String subType,
-            @Param("number") String number,
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("dhIds") String dhIds,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);

-    int countsByDepotHead(
-            @Param("type") String type,
-            @Param("subType") String subType,
-            @Param("number") String number,
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("dhIds") String dhIds);
-
-    Long getMaxId();
-
-    String findMaterialsListByHeaderId(
-            @Param("id") Long id);
-
-    List<DepotHeadVo4InDetail> findByAll(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("type") String type,
-            @Param("pid") Integer pid,
-            @Param("dids") String dids,
-            @Param("oId") Integer oId,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findByAllCount(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("type") String type,
-            @Param("pid") Integer pid,
-            @Param("dids") String dids,
-            @Param("oId") Integer oId);
-
-    List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("type") String type,
-            @Param("pid") Integer pid,
-            @Param("dids") String dids,
-            @Param("oId") Integer oId,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findInOutMaterialCountTotal(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("type") String type,
-            @Param("pid") Integer pid,
-            @Param("dids") String dids,
-            @Param("oId") Integer oId);
-
-    List<DepotHeadVo4StatementAccount> findStatementAccount(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("organId") Integer organId,
-            @Param("supType") String supType,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findStatementAccountCount(
-            @Param("beginTime") String beginTime,
-            @Param("endTime") String endTime,
-            @Param("organId") Integer organId,
-            @Param("supType") String supType);
-
-    BigDecimal findAllMoney(
-            @Param("supplierId") Integer supplierId,
-            @Param("type") String type,
-            @Param("subType") String subType,
-            @Param("modeName") String modeName,
-            @Param("endTime") String endTime);
-
-    List<DepotHeadVo4List> getDetailByNumber(
-            @Param("number") String number);

 }
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -0,0 +1,110 @@
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.DepotHead;
+import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
+import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
+import com.jsh.erp.datasource.vo.DepotHeadVo4List;
+import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/1/25 14:50
+ */
+public interface DepotHeadMapperEx {
+    List<DepotHeadVo4List> selectByConditionDepotHead(
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("number") String number,
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("dhIds") String dhIds,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByDepotHead(
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("number") String number,
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("dhIds") String dhIds);
+
+    Long getMaxId();
+
+    String findMaterialsListByHeaderId(
+            @Param("id") Long id);
+
+    List<DepotHeadVo4InDetail> findByAll(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("type") String type,
+            @Param("pid") Integer pid,
+            @Param("dids") String dids,
+            @Param("oId") Integer oId,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findByAllCount(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("type") String type,
+            @Param("pid") Integer pid,
+            @Param("dids") String dids,
+            @Param("oId") Integer oId);
+
+    List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("type") String type,
+            @Param("pid") Integer pid,
+            @Param("dids") String dids,
+            @Param("oId") Integer oId,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findInOutMaterialCountTotal(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("type") String type,
+            @Param("pid") Integer pid,
+            @Param("dids") String dids,
+            @Param("oId") Integer oId);
+
+    List<DepotHeadVo4StatementAccount> findStatementAccount(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("organId") Integer organId,
+            @Param("supType") String supType,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findStatementAccountCount(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("organId") Integer organId,
+            @Param("supType") String supType);
+
+    BigDecimal findAllMoney(
+            @Param("supplierId") Integer supplierId,
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("modeName") String modeName,
+            @Param("endTime") String endTime);
+
+    List<DepotHeadVo4List> getDetailByNumber(
+            @Param("number") String number);
+    /**
+     * 新增单据主表信息，并反显单据主表id
+     * */
+    int adddepotHead(DepotHead depotHead);
+    /**
+     * 更新单据主表信息
+     * */
+    void updatedepotHead(DepotHead depotHead);
+}
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
@@ -96,123 +96,6 @@ public interface DepotItemMapper {
     */
    int updateByPrimaryKey(DepotItem record);

-    List<DepotItem> selectByConditionDepotItem(
-            @Param("name") String name,
-            @Param("type") Integer type,
-            @Param("remark") String remark,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);

-    int countsByDepotItem(
-            @Param("name") String name,
-            @Param("type") Integer type,
-            @Param("remark") String remark);
-
-    List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
-            @Param("materialParam") String materialParam,
-            @Param("depotIds") String depotIds);
-
-    List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
-            @Param("mId") Long mId,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findDetailByTypeAndMaterialIdCounts(
-            @Param("mId") Long mId);
-
-    List<DepotItemVo4Material> findStockNumByMaterialIdList(
-            @Param("mId") Long mId,
-            @Param("monthTime") String monthTime,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findStockNumByMaterialIdCounts(
-            @Param("mId") Long mId,
-            @Param("monthTime") String monthTime);
-
-    int findByTypeAndMaterialIdIn(
-            @Param("mId") Long mId);
-
-    int findByTypeAndMaterialIdOut(
-            @Param("mId") Long mId);
-
-    List<DepotItemVo4WithInfoEx> getDetailList(
-            @Param("headerId") Long headerId);
-
-    List<DepotItemVo4WithInfoEx> findByAll(
-            @Param("headIds") String headIds,
-            @Param("materialIds") String materialIds,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int findByAllCount(
-            @Param("headIds") String headIds,
-            @Param("materialIds") String materialIds);
-
-    BigDecimal findByTypeInIsPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findByTypeInIsNotPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findByTypeOutIsPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findByTypeOutIsNotPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-
-
-    BigDecimal findPriceByTypeInIsPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findPriceByTypeInIsNotPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findPriceByTypeOutIsPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal findPriceByTypeOutIsNotPrev(
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime);
-
-    BigDecimal buyOrSaleNumber(
-            @Param("type") String type,
-            @Param("subType") String subType,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime,
-            @Param("sumType") String sumType);
-
-    BigDecimal buyOrSalePrice(
-            @Param("type") String type,
-            @Param("subType") String subType,
-            @Param("MId") Long MId,
-            @Param("MonthTime") String MonthTime,
-            @Param("sumType") String sumType);
-
-    BigDecimal findGiftByTypeIn(
-            @Param("subType") String subType,
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId);
-
-    BigDecimal findGiftByTypeOut(
-            @Param("subType") String subType,
-            @Param("ProjectId") Integer ProjectId,
-            @Param("MId") Long MId);

 }
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
@@ -0,0 +1,148 @@
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/1/24 16:59
+ */
+public interface DepotItemMapperEx {
+    List<DepotItem> selectByConditionDepotItem(
+            @Param("name") String name,
+            @Param("type") Integer type,
+            @Param("remark") String remark,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByDepotItem(
+            @Param("name") String name,
+            @Param("type") Integer type,
+            @Param("remark") String remark);
+
+    List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
+            @Param("materialParam") String materialParam,
+            @Param("depotIds") String depotIds);
+
+    List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
+            @Param("mId") Long mId,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findDetailByTypeAndMaterialIdCounts(
+            @Param("mId") Long mId);
+
+    List<DepotItemVo4Material> findStockNumByMaterialIdList(
+            @Param("mId") Long mId,
+            @Param("monthTime") String monthTime,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findStockNumByMaterialIdCounts(
+            @Param("mId") Long mId,
+            @Param("monthTime") String monthTime);
+
+    int findByTypeAndMaterialIdIn(
+            @Param("mId") Long mId);
+
+    int findByTypeAndMaterialIdOut(
+            @Param("mId") Long mId);
+
+    List<DepotItemVo4WithInfoEx> getDetailList(
+            @Param("headerId") Long headerId);
+
+    List<DepotItemVo4WithInfoEx> findByAll(
+            @Param("headIds") String headIds,
+            @Param("materialIds") String materialIds,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int findByAllCount(
+            @Param("headIds") String headIds,
+            @Param("materialIds") String materialIds);
+
+    BigDecimal findByTypeInIsPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findByTypeInIsNotPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findByTypeOutIsPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findByTypeOutIsNotPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+
+
+    BigDecimal findPriceByTypeInIsPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findPriceByTypeInIsNotPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findPriceByTypeOutIsPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal findPriceByTypeOutIsNotPrev(
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime);
+
+    BigDecimal buyOrSaleNumber(
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime,
+            @Param("sumType") String sumType);
+
+    BigDecimal buyOrSalePrice(
+            @Param("type") String type,
+            @Param("subType") String subType,
+            @Param("MId") Long MId,
+            @Param("MonthTime") String MonthTime,
+            @Param("sumType") String sumType);
+
+    BigDecimal findGiftByTypeIn(
+            @Param("subType") String subType,
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId);
+
+    BigDecimal findGiftByTypeOut(
+            @Param("subType") String subType,
+            @Param("ProjectId") Integer ProjectId,
+            @Param("MId") Long MId);
+    /**
+     * create by: cjl
+     * description:
+     *  通过单据主表id查询所有单据子表数据
+     * create time: 2019/1/24 16:56
+     * @Param: depotheadId
+     * @return java.util.List<com.jsh.erp.datasource.entities.DepotItem>
+     */
+     List<DepotItem> findDepotItemListBydepotheadId(@Param("depotheadId")Long depotheadId,
+                                                    @Param("enableSerialNumber")String enableSerialNumber);
+     /**
+      * 根据单据主表id删除单据子表数据
+      * */
+     int deleteDepotItemByDepotHeadIds(@Param("depotheadIds")Long []depotHeadIds);
+}
--- a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
@@ -1,9 +1,9 @@
 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;

+import java.util.Date;
 import java.util.List;

 /**
@@ -42,4 +42,19 @@ public interface SerialNumberMapperEx {
     * 未删除为卖出的视为有效
     * */
    int findSerialNumberByMaterialId(@Param("materialId") Long materialId);
+    /**
+     * 查询符合条件的序列号数量
+     * */
+    int countSerialNumberByMaterialIdAndDepotheadId(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("isSell")String isSell);
+    /**
+     * 卖出： update jsh_serial_number set is_Sell='1' ,depothead_Id='depotheadId' where 1=1 and material_Id='materialId'
+     * and is_Sell !='1' and delete_Flag !='1'  {limit 0，count}
+     * */
+    int sellSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId,@Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
+    /**
+     * 赎回：update jsh_serial_number set is_Sell='0'  where 1=1 and material_Id='materialId'
+     *      and depothead_Id='depotheadId' and is_Sell ！='0' and delete_Flag !='1' {limit 0，count}
+     * */
+    int cancelSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
+
 }