1、给系统参数表增加移动平均价标记 2、给实时库存表增加当前单价字段

2024-05-21 23:22:29 +08:00
parent 45176c40fa
commit 9eaffcd88e
8 changed files with 211 additions and 17 deletions
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialCurrentStock.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialCurrentStock.java
@@ -11,6 +11,8 @@ public class MaterialCurrentStock {

    private BigDecimal currentNumber;

+    private BigDecimal currentUnitPrice;
+
    private Long tenantId;

    private String deleteFlag;
@@ -47,6 +49,14 @@ public class MaterialCurrentStock {
        this.currentNumber = currentNumber;
    }

+    public BigDecimal getCurrentUnitPrice() {
+        return currentUnitPrice;
+    }
+
+    public void setCurrentUnitPrice(BigDecimal currentUnitPrice) {
+        this.currentUnitPrice = currentUnitPrice;
+    }
+
    public Long getTenantId() {
        return tenantId;
    }
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialCurrentStockExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialCurrentStockExample.java
@@ -345,6 +345,66 @@ public class MaterialCurrentStockExample {
            return (Criteria) this;
        }

+        public Criteria andCurrentUnitPriceIsNull() {
+            addCriterion("current_unit_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceIsNotNull() {
+            addCriterion("current_unit_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceEqualTo(BigDecimal value) {
+            addCriterion("current_unit_price =", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceNotEqualTo(BigDecimal value) {
+            addCriterion("current_unit_price <>", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceGreaterThan(BigDecimal value) {
+            addCriterion("current_unit_price >", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("current_unit_price >=", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceLessThan(BigDecimal value) {
+            addCriterion("current_unit_price <", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("current_unit_price <=", value, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceIn(List<BigDecimal> values) {
+            addCriterion("current_unit_price in", values, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceNotIn(List<BigDecimal> values) {
+            addCriterion("current_unit_price not in", values, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("current_unit_price between", value1, value2, "currentUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("current_unit_price not between", value1, value2, "currentUnitPrice");
+            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/SystemConfig.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
@@ -39,6 +39,8 @@ public class SystemConfig {

    private String multiAccountFlag;

+    private String moveAvgPriceFlag;
+
    private Long tenantId;

    private String deleteFlag;
@@ -195,6 +197,14 @@ public class SystemConfig {
        this.multiAccountFlag = multiAccountFlag == null ? null : multiAccountFlag.trim();
    }

+    public String getMoveAvgPriceFlag() {
+        return moveAvgPriceFlag;
+    }
+
+    public void setMoveAvgPriceFlag(String moveAvgPriceFlag) {
+        this.moveAvgPriceFlag = moveAvgPriceFlag == null ? null : moveAvgPriceFlag.trim();
+    }
+
    public Long getTenantId() {
        return tenantId;
    }
--- 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
@@ -1424,6 +1424,76 @@ public class SystemConfigExample {
            return (Criteria) this;
        }

+        public Criteria andMoveAvgPriceFlagIsNull() {
+            addCriterion("move_avg_price_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagIsNotNull() {
+            addCriterion("move_avg_price_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagEqualTo(String value) {
+            addCriterion("move_avg_price_flag =", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagNotEqualTo(String value) {
+            addCriterion("move_avg_price_flag <>", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagGreaterThan(String value) {
+            addCriterion("move_avg_price_flag >", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("move_avg_price_flag >=", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagLessThan(String value) {
+            addCriterion("move_avg_price_flag <", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagLessThanOrEqualTo(String value) {
+            addCriterion("move_avg_price_flag <=", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagLike(String value) {
+            addCriterion("move_avg_price_flag like", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagNotLike(String value) {
+            addCriterion("move_avg_price_flag not like", value, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagIn(List<String> values) {
+            addCriterion("move_avg_price_flag in", values, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagNotIn(List<String> values) {
+            addCriterion("move_avg_price_flag not in", values, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagBetween(String value1, String value2) {
+            addCriterion("move_avg_price_flag between", value1, value2, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoveAvgPriceFlagNotBetween(String value1, String value2) {
+            addCriterion("move_avg_price_flag not between", value1, value2, "moveAvgPriceFlag");
+            return (Criteria) this;
+        }
+
        public Criteria andTenantIdIsNull() {
            addCriterion("tenant_id is null");
            return (Criteria) this;
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml
@@ -6,6 +6,7 @@
    <result column="material_id" jdbcType="BIGINT" property="materialId" />
    <result column="depot_id" jdbcType="BIGINT" property="depotId" />
    <result column="current_number" jdbcType="DECIMAL" property="currentNumber" />
+    <result column="current_unit_price" jdbcType="DECIMAL" property="currentUnitPrice" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
@@ -68,7 +69,7 @@
    </where>
  </sql>
  <sql id="Base_Column_List">
-    id, material_id, depot_id, current_number, tenant_id, delete_flag
+    id, material_id, depot_id, current_number, current_unit_price, tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCurrentStockExample" resultMap="BaseResultMap">
    select
@@ -102,11 +103,11 @@
  </delete>
  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialCurrentStock">
    insert into jsh_material_current_stock (id, material_id, depot_id, 
-      current_number, tenant_id, delete_flag
-      )
+      current_number, current_unit_price, tenant_id, 
+      delete_flag)
    values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{depotId,jdbcType=BIGINT}, 
-      #{currentNumber,jdbcType=DECIMAL}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
-      )
+      #{currentNumber,jdbcType=DECIMAL}, #{currentUnitPrice,jdbcType=DECIMAL}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCurrentStock">
    insert into jsh_material_current_stock
@@ -123,6 +124,9 @@
      <if test="currentNumber != null">
        current_number,
      </if>
+      <if test="currentUnitPrice != null">
+        current_unit_price,
+      </if>
      <if test="tenantId != null">
        tenant_id,
      </if>
@@ -143,6 +147,9 @@
      <if test="currentNumber != null">
        #{currentNumber,jdbcType=DECIMAL},
      </if>
+      <if test="currentUnitPrice != null">
+        #{currentUnitPrice,jdbcType=DECIMAL},
+      </if>
      <if test="tenantId != null">
        #{tenantId,jdbcType=BIGINT},
      </if>
@@ -172,6 +179,9 @@
      <if test="record.currentNumber != null">
        current_number = #{record.currentNumber,jdbcType=DECIMAL},
      </if>
+      <if test="record.currentUnitPrice != null">
+        current_unit_price = #{record.currentUnitPrice,jdbcType=DECIMAL},
+      </if>
      <if test="record.tenantId != null">
        tenant_id = #{record.tenantId,jdbcType=BIGINT},
      </if>
@@ -189,6 +199,7 @@
      material_id = #{record.materialId,jdbcType=BIGINT},
      depot_id = #{record.depotId,jdbcType=BIGINT},
      current_number = #{record.currentNumber,jdbcType=DECIMAL},
+      current_unit_price = #{record.currentUnitPrice,jdbcType=DECIMAL},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
@@ -207,6 +218,9 @@
      <if test="currentNumber != null">
        current_number = #{currentNumber,jdbcType=DECIMAL},
      </if>
+      <if test="currentUnitPrice != null">
+        current_unit_price = #{currentUnitPrice,jdbcType=DECIMAL},
+      </if>
      <if test="tenantId != null">
        tenant_id = #{tenantId,jdbcType=BIGINT},
      </if>
@@ -221,6 +235,7 @@
    set material_id = #{materialId,jdbcType=BIGINT},
      depot_id = #{depotId,jdbcType=BIGINT},
      current_number = #{currentNumber,jdbcType=DECIMAL},
+      current_unit_price = #{currentUnitPrice,jdbcType=DECIMAL},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
--- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
@@ -21,6 +21,7 @@
    <result column="over_link_bill_flag" jdbcType="VARCHAR" property="overLinkBillFlag" />
    <result column="in_out_manage_flag" jdbcType="VARCHAR" property="inOutManageFlag" />
    <result column="multi_account_flag" jdbcType="VARCHAR" property="multiAccountFlag" />
+    <result column="move_avg_price_flag" jdbcType="VARCHAR" property="moveAvgPriceFlag" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
@@ -86,7 +87,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, update_unit_price_flag, 
-    over_link_bill_flag, in_out_manage_flag, multi_account_flag, tenant_id, delete_flag
+    over_link_bill_flag, in_out_manage_flag, multi_account_flag, move_avg_price_flag, 
+    tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
    select
@@ -126,7 +128,8 @@
      multi_level_approval_flag, multi_bill_type, 
      force_approval_flag, update_unit_price_flag, 
      over_link_bill_flag, in_out_manage_flag, multi_account_flag, 
-      tenant_id, delete_flag)
+      move_avg_price_flag, tenant_id, delete_flag
+      )
    values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, 
      #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, 
      #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, 
@@ -134,7 +137,8 @@
      #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR}, 
      #{forceApprovalFlag,jdbcType=VARCHAR}, #{updateUnitPriceFlag,jdbcType=VARCHAR}, 
      #{overLinkBillFlag,jdbcType=VARCHAR}, #{inOutManageFlag,jdbcType=VARCHAR}, #{multiAccountFlag,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+      #{moveAvgPriceFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
    insert into jsh_system_config
@@ -196,6 +200,9 @@
      <if test="multiAccountFlag != null">
        multi_account_flag,
      </if>
+      <if test="moveAvgPriceFlag != null">
+        move_avg_price_flag,
+      </if>
      <if test="tenantId != null">
        tenant_id,
      </if>
@@ -261,6 +268,9 @@
      <if test="multiAccountFlag != null">
        #{multiAccountFlag,jdbcType=VARCHAR},
      </if>
+      <if test="moveAvgPriceFlag != null">
+        #{moveAvgPriceFlag,jdbcType=VARCHAR},
+      </if>
      <if test="tenantId != null">
        #{tenantId,jdbcType=BIGINT},
      </if>
@@ -335,6 +345,9 @@
      <if test="record.multiAccountFlag != null">
        multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR},
      </if>
+      <if test="record.moveAvgPriceFlag != null">
+        move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR},
+      </if>
      <if test="record.tenantId != null">
        tenant_id = #{record.tenantId,jdbcType=BIGINT},
      </if>
@@ -367,6 +380,7 @@
      over_link_bill_flag = #{record.overLinkBillFlag,jdbcType=VARCHAR},
      in_out_manage_flag = #{record.inOutManageFlag,jdbcType=VARCHAR},
      multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR},
+      move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
@@ -430,6 +444,9 @@
      <if test="multiAccountFlag != null">
        multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR},
      </if>
+      <if test="moveAvgPriceFlag != null">
+        move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR},
+      </if>
      <if test="tenantId != null">
        tenant_id = #{tenantId,jdbcType=BIGINT},
      </if>
@@ -459,6 +476,7 @@
      over_link_bill_flag = #{overLinkBillFlag,jdbcType=VARCHAR},
      in_out_manage_flag = #{inOutManageFlag,jdbcType=VARCHAR},
      multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR},
+      move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}