From 09b603c80e2082cb73b54a52b000c612bd9afa84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 28 Sep 2021 00:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=92=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/数据库更新记录-首次安装请勿使用.txt | 20 +- .../erp/controller/DepotItemController.java | 4 + .../erp/datasource/entities/DepotItem.java | 31 +++ .../datasource/entities/DepotItemExample.java | 201 ++++++++++++++++++ .../jsh/erp/datasource/entities/Material.java | 20 ++ .../datasource/entities/MaterialExample.java | 130 +++++++++++ .../datasource/mappers/MaterialMapperEx.java | 2 + .../service/depotItem/DepotItemService.java | 13 +- .../erp/service/material/MaterialService.java | 3 + .../resources/mapper_xml/DepotItemMapper.xml | 50 ++++- .../resources/mapper_xml/MaterialMapper.xml | 48 ++++- .../resources/mapper_xml/MaterialMapperEx.xml | 8 + 12 files changed, 519 insertions(+), 11 deletions(-) diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index ff046033..ecd5be99 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1230,4 +1230,22 @@ INSERT INTO `jsh_platform_config` (`id`, `platform_key`, `platform_key_info`, `p -- by jishenghua -- 修改单据主表的状态字段描述 -- -------------------------------------------------------- -alter table jsh_depot_head change status status varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2完成采购|销售、3部分采购|销售'; \ No newline at end of file +alter table jsh_depot_head change status status varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2完成采购|销售、3部分采购|销售'; + +-- -------------------------------------------------------- +-- 时间 2021年9月27日 +-- by jishenghua +-- 给商品表和单据字表增加字段 +-- -------------------------------------------------------- +alter table jsh_material add enable_batch_number varchar(1) DEFAULT 0 COMMENT '是否开启批号，0否，1是' after enable_serial_number; +alter table jsh_material add expiry_num int(10) DEFAULT NULL COMMENT '保质期天数' after unit_id; +alter table jsh_depot_item add sn_list varchar(2000) DEFAULT NULL COMMENT '序列号列表' after material_type; +alter table jsh_depot_item add batch_number varchar(100) DEFAULT NULL COMMENT '批号' after sn_list; +alter table jsh_depot_item add expiration_date datetime DEFAULT NULL COMMENT '有效日期' after batch_number; + +-- -------------------------------------------------------- +-- 时间 2021年9月27日 +-- by jishenghua +-- 插入jsh_platform_config数据，配置租户续费地址 +-- -------------------------------------------------------- +INSERT INTO `jsh_platform_config` (`platform_key`, `platform_key_info`, `platform_value`) VALUES ('pay_fee_url', '租户续费地址', ''); \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 1e9d599d..9aab0a31 100644 --- 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()); diff --git 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 index 34d6cea9..32d7530f 100644 --- 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; } diff --git 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 index 1bcf794c..d9aa74dc 100644 --- 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 values) { + addCriterion("sn_list in", values, "snList"); + return (Criteria) this; + } + + public Criteria andSnListNotIn(List 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 values) { + addCriterion("batch_number in", values, "batchNumber"); + return (Criteria) this; + } + + public Criteria andBatchNumberNotIn(List 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 values) { + addCriterion("expiration_date in", values, "expirationDate"); + return (Criteria) this; + } + + public Criteria andExpirationDateNotIn(List 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; diff --git 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 index ebd0397d..92b04c09 100644 --- 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; } diff --git 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 index 4b0a6865..aeb8dd1a 100644 --- 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 values) { + addCriterion("expiry_num in", values, "expiryNum"); + return (Criteria) this; + } + + public Criteria andExpiryNumNotIn(List 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 values) { + addCriterion("enable_batch_number in", values, "enableBatchNumber"); + return (Criteria) this; + } + + public Criteria andEnableBatchNumberNotIn(List 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; diff --git 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 index ab964b60..9aec39c2 100644 --- 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 getMaterialByBarCode(@Param("barCodeArray") String [] barCodeArray); List getListWithStock( diff --git 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 index bdae8f91..d65154d4 100644 --- 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(); diff --git 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 index a412d8a3..737a9cd2 100644 --- 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"); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml index c848eb02..2223a93c 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml @@ -20,6 +20,9 @@ + + + @@ -84,7 +87,8 @@ id, header_id, material_id, material_extend_id, material_unit, sku, oper_number, basic_number, unit_price, tax_unit_price, all_price, remark, depot_id, another_depot_id, - tax_rate, tax_money, tax_last_money, material_type, tenant_id, delete_flag + tax_rate, tax_money, tax_last_money, material_type, sn_list, batch_number, expiration_date, + tenant_id, delete_flag select @@ -120,16 +122,18 @@ mfrs, safety_stock, model, standard, color, unit, remark, img_name, unit_id, - enabled, other_field1, other_field2, - other_field3, enable_serial_number, tenant_id, - delete_flag) + expiry_num, enabled, other_field1, + other_field2, other_field3, enable_serial_number, + enable_batch_number, tenant_id, delete_flag + ) values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{mfrs,jdbcType=VARCHAR}, #{safetyStock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{imgName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, - #{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, - #{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, - #{deleteFlag,jdbcType=VARCHAR}) + #{expiryNum,jdbcType=INTEGER}, #{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR}, + #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR}, + #{enableBatchNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} + ) insert into jsh_material @@ -170,6 +174,9 @@ unit_id, + + expiry_num, + enabled, @@ -185,6 +192,9 @@ enable_serial_number, + + enable_batch_number, + tenant_id, @@ -229,6 +239,9 @@ #{unitId,jdbcType=BIGINT}, + + #{expiryNum,jdbcType=INTEGER}, + #{enabled,jdbcType=BIT}, @@ -244,6 +257,9 @@ #{enableSerialNumber,jdbcType=VARCHAR}, + + #{enableBatchNumber,jdbcType=VARCHAR}, + #{tenantId,jdbcType=BIGINT}, @@ -297,6 +313,9 @@ unit_id = #{record.unitId,jdbcType=BIGINT}, + + expiry_num = #{record.expiryNum,jdbcType=INTEGER}, + enabled = #{record.enabled,jdbcType=BIT}, @@ -312,6 +331,9 @@ enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR}, + + enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, @@ -337,11 +359,13 @@ remark = #{record.remark,jdbcType=VARCHAR}, img_name = #{record.imgName,jdbcType=VARCHAR}, unit_id = #{record.unitId,jdbcType=BIGINT}, + expiry_num = #{record.expiryNum,jdbcType=INTEGER}, enabled = #{record.enabled,jdbcType=BIT}, other_field1 = #{record.otherField1,jdbcType=VARCHAR}, other_field2 = #{record.otherField2,jdbcType=VARCHAR}, other_field3 = #{record.otherField3,jdbcType=VARCHAR}, enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR}, + enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} @@ -384,6 +408,9 @@ unit_id = #{unitId,jdbcType=BIGINT}, + + expiry_num = #{expiryNum,jdbcType=INTEGER}, + enabled = #{enabled,jdbcType=BIT}, @@ -399,6 +426,9 @@ enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR}, + + enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR}, + tenant_id = #{tenantId,jdbcType=BIGINT}, @@ -421,11 +451,13 @@ remark = #{remark,jdbcType=VARCHAR}, img_name = #{imgName,jdbcType=VARCHAR}, unit_id = #{unitId,jdbcType=BIGINT}, + expiry_num = #{expiryNum,jdbcType=INTEGER}, enabled = #{enabled,jdbcType=BIT}, other_field1 = #{otherField1,jdbcType=VARCHAR}, other_field2 = #{otherField2,jdbcType=VARCHAR}, other_field3 = #{otherField3,jdbcType=VARCHAR}, enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR}, + enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, delete_flag = #{deleteFlag,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index 227f3566..8c11c9a9 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -327,6 +327,14 @@ and id = #{id} + + update jsh_material + set expiry_num = null + where 1=1 + and ifnull(delete_flag,'0') !='1' + and id = #{id} + +