给商品和单据增加序列号和批次字段

2021-09-28 00:28:23 +08:00
parent 06d91f8655
commit 09b603c80e
12 changed files with 519 additions and 11 deletions
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -27,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;

 import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
+import static com.jsh.erp.utils.Tools.getCenternTime;

 /**
 * @author ji-sheng-hua 华夏erp
@@ -194,6 +195,9 @@ public class DepotItemController {
                    }
                    item.put("stock", stock);
                    item.put("unit", diEx.getMaterialUnit());
+                    item.put("snList", diEx.getSnList());
+                    item.put("batchNumber", diEx.getBatchNumber());
+                    item.put("expirationDate", Tools.parseDateToStr(diEx.getExpirationDate()));
                    item.put("sku", diEx.getSku());
                    item.put("operNumber", diEx.getOperNumber());
                    item.put("basicNumber", diEx.getBasicNumber());
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
@@ -1,6 +1,7 @@
 package com.jsh.erp.datasource.entities;

 import java.math.BigDecimal;
+import java.util.Date;

 public class DepotItem {
    private Long id;
@@ -39,6 +40,12 @@ public class DepotItem {

    private String materialType;

+    private String snList;
+
+    private String batchNumber;
+
+    private Date expirationDate;
+
    private Long tenantId;

    private String deleteFlag;
@@ -187,6 +194,30 @@ public class DepotItem {
        this.materialType = materialType == null ? null : materialType.trim();
    }

+    public String getSnList() {
+        return snList;
+    }
+
+    public void setSnList(String snList) {
+        this.snList = snList == null ? null : snList.trim();
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber == null ? null : batchNumber.trim();
+    }
+
+    public Date getExpirationDate() {
+        return expirationDate;
+    }
+
+    public void setExpirationDate(Date expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+
    public Long getTenantId() {
        return tenantId;
    }
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
@@ -2,6 +2,7 @@ package com.jsh.erp.datasource.entities;

 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;

 public class DepotItemExample {
@@ -1225,6 +1226,206 @@ public class DepotItemExample {
            return (Criteria) this;
        }

+        public Criteria andSnListIsNull() {
+            addCriterion("sn_list is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListIsNotNull() {
+            addCriterion("sn_list is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListEqualTo(String value) {
+            addCriterion("sn_list =", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListNotEqualTo(String value) {
+            addCriterion("sn_list <>", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListGreaterThan(String value) {
+            addCriterion("sn_list >", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListGreaterThanOrEqualTo(String value) {
+            addCriterion("sn_list >=", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListLessThan(String value) {
+            addCriterion("sn_list <", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListLessThanOrEqualTo(String value) {
+            addCriterion("sn_list <=", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListLike(String value) {
+            addCriterion("sn_list like", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListNotLike(String value) {
+            addCriterion("sn_list not like", value, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListIn(List<String> values) {
+            addCriterion("sn_list in", values, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListNotIn(List<String> values) {
+            addCriterion("sn_list not in", values, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListBetween(String value1, String value2) {
+            addCriterion("sn_list between", value1, value2, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andSnListNotBetween(String value1, String value2) {
+            addCriterion("sn_list not between", value1, value2, "snList");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberIsNull() {
+            addCriterion("batch_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberIsNotNull() {
+            addCriterion("batch_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberEqualTo(String value) {
+            addCriterion("batch_number =", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberNotEqualTo(String value) {
+            addCriterion("batch_number <>", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberGreaterThan(String value) {
+            addCriterion("batch_number >", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("batch_number >=", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberLessThan(String value) {
+            addCriterion("batch_number <", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberLessThanOrEqualTo(String value) {
+            addCriterion("batch_number <=", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberLike(String value) {
+            addCriterion("batch_number like", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberNotLike(String value) {
+            addCriterion("batch_number not like", value, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberIn(List<String> values) {
+            addCriterion("batch_number in", values, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberNotIn(List<String> values) {
+            addCriterion("batch_number not in", values, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberBetween(String value1, String value2) {
+            addCriterion("batch_number between", value1, value2, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBatchNumberNotBetween(String value1, String value2) {
+            addCriterion("batch_number not between", value1, value2, "batchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateIsNull() {
+            addCriterion("expiration_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateIsNotNull() {
+            addCriterion("expiration_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateEqualTo(Date value) {
+            addCriterion("expiration_date =", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateNotEqualTo(Date value) {
+            addCriterion("expiration_date <>", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateGreaterThan(Date value) {
+            addCriterion("expiration_date >", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("expiration_date >=", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateLessThan(Date value) {
+            addCriterion("expiration_date <", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateLessThanOrEqualTo(Date value) {
+            addCriterion("expiration_date <=", value, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateIn(List<Date> values) {
+            addCriterion("expiration_date in", values, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateNotIn(List<Date> values) {
+            addCriterion("expiration_date not in", values, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateBetween(Date value1, Date value2) {
+            addCriterion("expiration_date between", value1, value2, "expirationDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpirationDateNotBetween(Date value1, Date value2) {
+            addCriterion("expiration_date not between", value1, value2, "expirationDate");
+            return (Criteria) this;
+        }
+
        public Criteria andTenantIdIsNull() {
            addCriterion("tenant_id is null");
            return (Criteria) this;
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
@@ -27,6 +27,8 @@ public class Material {

    private Long unitId;

+    private Integer expiryNum;
+
    private Boolean enabled;

    private String otherField1;
@@ -37,6 +39,8 @@ public class Material {

    private String enableSerialNumber;

+    private String enableBatchNumber;
+
    private Long tenantId;

    private String deleteFlag;
@@ -137,6 +141,14 @@ public class Material {
        this.unitId = unitId;
    }

+    public Integer getExpiryNum() {
+        return expiryNum;
+    }
+
+    public void setExpiryNum(Integer expiryNum) {
+        this.expiryNum = expiryNum;
+    }
+
    public Boolean getEnabled() {
        return enabled;
    }
@@ -177,6 +189,14 @@ public class Material {
        this.enableSerialNumber = enableSerialNumber == null ? null : enableSerialNumber.trim();
    }

+    public String getEnableBatchNumber() {
+        return enableBatchNumber;
+    }
+
+    public void setEnableBatchNumber(String enableBatchNumber) {
+        this.enableBatchNumber = enableBatchNumber == null ? null : enableBatchNumber.trim();
+    }
+
    public Long getTenantId() {
        return tenantId;
    }
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
@@ -905,6 +905,66 @@ public class MaterialExample {
            return (Criteria) this;
        }

+        public Criteria andExpiryNumIsNull() {
+            addCriterion("expiry_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumIsNotNull() {
+            addCriterion("expiry_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumEqualTo(Integer value) {
+            addCriterion("expiry_num =", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumNotEqualTo(Integer value) {
+            addCriterion("expiry_num <>", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumGreaterThan(Integer value) {
+            addCriterion("expiry_num >", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("expiry_num >=", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumLessThan(Integer value) {
+            addCriterion("expiry_num <", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumLessThanOrEqualTo(Integer value) {
+            addCriterion("expiry_num <=", value, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumIn(List<Integer> values) {
+            addCriterion("expiry_num in", values, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumNotIn(List<Integer> values) {
+            addCriterion("expiry_num not in", values, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumBetween(Integer value1, Integer value2) {
+            addCriterion("expiry_num between", value1, value2, "expiryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpiryNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("expiry_num not between", value1, value2, "expiryNum");
+            return (Criteria) this;
+        }
+
        public Criteria andEnabledIsNull() {
            addCriterion("enabled is null");
            return (Criteria) this;
@@ -1245,6 +1305,76 @@ public class MaterialExample {
            return (Criteria) this;
        }

+        public Criteria andEnableBatchNumberIsNull() {
+            addCriterion("enable_batch_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberIsNotNull() {
+            addCriterion("enable_batch_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberEqualTo(String value) {
+            addCriterion("enable_batch_number =", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberNotEqualTo(String value) {
+            addCriterion("enable_batch_number <>", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberGreaterThan(String value) {
+            addCriterion("enable_batch_number >", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("enable_batch_number >=", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberLessThan(String value) {
+            addCriterion("enable_batch_number <", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberLessThanOrEqualTo(String value) {
+            addCriterion("enable_batch_number <=", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberLike(String value) {
+            addCriterion("enable_batch_number like", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberNotLike(String value) {
+            addCriterion("enable_batch_number not like", value, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberIn(List<String> values) {
+            addCriterion("enable_batch_number in", values, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberNotIn(List<String> values) {
+            addCriterion("enable_batch_number not in", values, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberBetween(String value1, String value2) {
+            addCriterion("enable_batch_number between", value1, value2, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBatchNumberNotBetween(String value1, String value2) {
+            addCriterion("enable_batch_number not between", value1, value2, "enableBatchNumber");
+            return (Criteria) this;
+        }
+
        public Criteria andTenantIdIsNull() {
            addCriterion("tenant_id is null");
            return (Criteria) this;
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
@@ -84,6 +84,8 @@ public interface MaterialMapperEx {

    int setUnitIdToNull(@Param("id") Long id);

+    int setExpiryNumToNull(@Param("id") Long id);
+
    List<MaterialVo4Unit> getMaterialByBarCode(@Param("barCodeArray") String [] barCodeArray);

    List<MaterialVo4Unit> getListWithStock(
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -333,7 +333,18 @@ public class DepotItemService {
                depotItem.setMaterialId(materialExtend.getMaterialId());
                depotItem.setMaterialExtendId(materialExtend.getId());
                depotItem.setMaterialUnit(rowObj.getString("unit"));
-                depotItem.setSku(rowObj.getString("sku"));
+                if (StringUtil.isExist(rowObj.get("snList"))) {
+                    depotItem.setSnList(rowObj.getString("snList"));
+                }
+                if (StringUtil.isExist(rowObj.get("batchNumber"))) {
+                    depotItem.setBatchNumber(rowObj.getString("batchNumber"));
+                }
+                if (StringUtil.isExist(rowObj.get("expirationDate"))) {
+                    depotItem.setExpirationDate(rowObj.getDate("expirationDate"));
+                }
+                if (StringUtil.isExist(rowObj.get("sku"))) {
+                    depotItem.setSku(rowObj.getString("sku"));
+                }
                if (StringUtil.isExist(rowObj.get("operNumber"))) {
                    depotItem.setOperNumber(rowObj.getBigDecimal("operNumber"));
                    String unit = rowObj.get("unit").toString();
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -211,6 +211,9 @@ public class MaterialService {
            if(material.getUnitId() == null) {
                materialMapperEx.setUnitIdToNull(material.getId());
            }
+            if(material.getExpiryNum() == null) {
+                materialMapperEx.setExpiryNumToNull(material.getId());
+            }
            materialExtendService.saveDetials(obj, obj.getString("sortList"),material.getId(), "update");
            if(obj.get("stock")!=null) {
                JSONArray stockArr = obj.getJSONArray("stock");