diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index cb8f24e4..1db63473 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50704 File Encoding : 65001 -Date: 2023-03-17 22:17:41 +Date: 2023-03-21 22:20:03 */ SET FOREIGN_KEY_CHECKS=0; @@ -853,6 +853,7 @@ CREATE TABLE `jsh_system_config` ( `multi_level_approval_flag` varchar(1) DEFAULT '0' COMMENT '多级审核启用标记，0未启用，1启用', `multi_bill_type` varchar(200) DEFAULT NULL COMMENT '流程类型，可多选', `force_approval_flag` varchar(1) DEFAULT '0' COMMENT '强审核启用标记，0未启用，1启用', + `update_unit_price_flag` varchar(1) DEFAULT '1' COMMENT '更新单价启用标记，0未启用，1启用', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`) @@ -861,7 +862,7 @@ CREATE TABLE `jsh_system_config` ( -- ---------------------------- -- Records of jsh_system_config -- ---------------------------- -INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '63', '0'); +INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '1', '63', '0'); -- ---------------------------- -- Table structure for jsh_tenant diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index a5c2fe19..d68942ac 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1466,4 +1466,11 @@ alter table jsh_account_head add source varchar(1) DEFAULT '0' COMMENT '单据 -- 增加零售统计菜单 -- -------------------------------------------------------- alter table jsh_system_config change amount_approval_flag force_approval_flag varchar(1) DEFAULT '0' COMMENT '强审核启用标记，0未启用，1启用'; -insert into `jsh_function` (`number`, `name`, `parent_number`, `url`, `component`, `state`, `sort`, `enabled`, `type`, `push_btn`, `icon`, `delete_flag`) VALUES ('030105', '零售统计', '0301', '/report/retail_out_report', '/report/RetailOutReport', b'0', '0615', b'1', '电脑版', '', 'profile', '0'); \ No newline at end of file +insert into `jsh_function` (`number`, `name`, `parent_number`, `url`, `component`, `state`, `sort`, `enabled`, `type`, `push_btn`, `icon`, `delete_flag`) VALUES ('030105', '零售统计', '0301', '/report/retail_out_report', '/report/RetailOutReport', b'0', '0615', b'1', '电脑版', '', 'profile', '0'); + +-- -------------------------------------------------------- +-- 时间 2023年03月08日 +-- by jishenghua +-- 给系统参数表增加更新单价启用标记 +-- -------------------------------------------------------- +alter table jsh_system_config add update_unit_price_flag varchar(1) DEFAULT '1' COMMENT '更新单价启用标记，0未启用，1启用' after force_approval_flag; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 766e651b..248704f7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -31,6 +31,8 @@ public class SystemConfig { private String forceApprovalFlag; + private String updateUnitPriceFlag; + private Long tenantId; private String deleteFlag; @@ -155,6 +157,14 @@ public class SystemConfig { this.forceApprovalFlag = forceApprovalFlag == null ? null : forceApprovalFlag.trim(); } + public String getUpdateUnitPriceFlag() { + return updateUnitPriceFlag; + } + + public void setUpdateUnitPriceFlag(String updateUnitPriceFlag) { + this.updateUnitPriceFlag = updateUnitPriceFlag == null ? null : updateUnitPriceFlag.trim(); + } + public Long getTenantId() { return tenantId; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index 2f370b57..2108c861 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -1144,6 +1144,76 @@ public class SystemConfigExample { return (Criteria) this; } + public Criteria andUpdateUnitPriceFlagIsNull() { + addCriterion("update_unit_price_flag is null"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagIsNotNull() { + addCriterion("update_unit_price_flag is not null"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagEqualTo(String value) { + addCriterion("update_unit_price_flag =", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagNotEqualTo(String value) { + addCriterion("update_unit_price_flag <>", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagGreaterThan(String value) { + addCriterion("update_unit_price_flag >", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagGreaterThanOrEqualTo(String value) { + addCriterion("update_unit_price_flag >=", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagLessThan(String value) { + addCriterion("update_unit_price_flag <", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagLessThanOrEqualTo(String value) { + addCriterion("update_unit_price_flag <=", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagLike(String value) { + addCriterion("update_unit_price_flag like", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagNotLike(String value) { + addCriterion("update_unit_price_flag not like", value, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagIn(List values) { + addCriterion("update_unit_price_flag in", values, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagNotIn(List values) { + addCriterion("update_unit_price_flag not in", values, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagBetween(String value1, String value2) { + addCriterion("update_unit_price_flag between", value1, value2, "updateUnitPriceFlag"); + return (Criteria) this; + } + + public Criteria andUpdateUnitPriceFlagNotBetween(String value1, String value2) { + addCriterion("update_unit_price_flag not between", value1, value2, "updateUnitPriceFlag"); + 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/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 8d7f1ed7..ba4a317c 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 @@ -826,20 +826,22 @@ public class DepotItemService { */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void updateMaterialExtendPrice(Long meId, String subType, JSONObject rowObj) throws Exception { - if (StringUtil.isExist(rowObj.get("unitPrice"))) { - BigDecimal unitPrice = rowObj.getBigDecimal("unitPrice"); - MaterialExtend materialExtend = new MaterialExtend(); - materialExtend.setId(meId); - if(BusinessConstants.SUB_TYPE_PURCHASE.equals(subType)) { - materialExtend.setPurchaseDecimal(unitPrice); + if(systemConfigService.getUpdateUnitPriceFlag()) { + if (StringUtil.isExist(rowObj.get("unitPrice"))) { + BigDecimal unitPrice = rowObj.getBigDecimal("unitPrice"); + MaterialExtend materialExtend = new MaterialExtend(); + materialExtend.setId(meId); + if(BusinessConstants.SUB_TYPE_PURCHASE.equals(subType)) { + materialExtend.setPurchaseDecimal(unitPrice); + } + if(BusinessConstants.SUB_TYPE_SALES.equals(subType)) { + materialExtend.setWholesaleDecimal(unitPrice); + } + if(BusinessConstants.SUB_TYPE_RETAIL.equals(subType)) { + materialExtend.setCommodityDecimal(unitPrice); + } + materialExtendService.updateMaterialExtend(materialExtend); } - if(BusinessConstants.SUB_TYPE_SALES.equals(subType)) { - materialExtend.setWholesaleDecimal(unitPrice); - } - if(BusinessConstants.SUB_TYPE_RETAIL.equals(subType)) { - materialExtend.setCommodityDecimal(unitPrice); - } - materialExtendService.updateMaterialExtend(materialExtend); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index fce28419..de639f69 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -200,6 +200,23 @@ public class SystemConfigService { return minusStockFlag; } + /** + * 获取更新单价开关 + * @return + * @throws Exception + */ + public boolean getUpdateUnitPriceFlag() throws Exception { + boolean updateUnitPriceFlag = true; + List list = getSystemConfig(); + if(list.size()>0) { + String flag = list.get(0).getUpdateUnitPriceFlag(); + if(("0").equals(flag)) { + updateUnitPriceFlag = false; + } + } + return updateUnitPriceFlag; + } + /** * 获取强审核开关 * @return diff --git a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml index 18ff4ad1..6757d039 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -17,6 +17,7 @@ + @@ -81,7 +82,8 @@ id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, - multi_level_approval_flag, multi_bill_type, force_approval_flag, tenant_id, delete_flag + multi_level_approval_flag, multi_bill_type, force_approval_flag, update_unit_price_flag, + tenant_id, delete_flag