去除单据多余的字段

2021-07-22 22:58:42 +08:00
parent 955fd58542
commit dd73a0d1e1
19 changed files with 191 additions and 1194 deletions
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -10,7 +10,6 @@
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="oper_time" jdbcType="TIMESTAMP" property="operTime" />
    <result column="organ_id" jdbcType="BIGINT" property="organId" />
-    <result column="hands_person_id" jdbcType="BIGINT" property="handsPersonId" />
    <result column="creator" jdbcType="BIGINT" property="creator" />
    <result column="account_id" jdbcType="BIGINT" property="accountId" />
    <result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
@@ -26,9 +25,6 @@
    <result column="discount_money" jdbcType="DECIMAL" property="discountMoney" />
    <result column="discount_last_money" jdbcType="DECIMAL" property="discountLastMoney" />
    <result column="other_money" jdbcType="DECIMAL" property="otherMoney" />
-    <result column="other_money_list" jdbcType="VARCHAR" property="otherMoneyList" />
-    <result column="other_money_item" jdbcType="VARCHAR" property="otherMoneyItem" />
-    <result column="account_day" jdbcType="INTEGER" property="accountDay" />
    <result column="status" jdbcType="VARCHAR" property="status" />
    <result column="link_number" jdbcType="VARCHAR" property="linkNumber" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
@@ -93,11 +89,10 @@
    </where>
  </sql>
  <sql id="Base_Column_List">
-    id, type, sub_type, default_number, number, create_time, oper_time, organ_id, hands_person_id, 
-    creator, account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, 
-    sales_man, account_id_list, account_money_list, discount, discount_money, discount_last_money, 
-    other_money, other_money_list, other_money_item, account_day, status, link_number, 
-    tenant_id, delete_flag
+    id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator, 
+    account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, sales_man, 
+    account_id_list, account_money_list, discount, discount_money, discount_last_money, 
+    other_money, status, link_number, tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
    select
@@ -132,26 +127,24 @@
  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
    insert into jsh_depot_head (id, type, sub_type, 
      default_number, number, create_time, 
-      oper_time, organ_id, hands_person_id, 
-      creator, account_id, change_amount, 
-      total_price, pay_type, bill_type, 
-      remark, file_name, sales_man, 
-      account_id_list, account_money_list, discount, 
-      discount_money, discount_last_money, other_money, 
-      other_money_list, other_money_item, account_day, 
-      status, link_number, tenant_id, 
-      delete_flag)
+      oper_time, organ_id, creator, 
+      account_id, change_amount, total_price, 
+      pay_type, bill_type, remark, 
+      file_name, sales_man, account_id_list, 
+      account_money_list, discount, discount_money, 
+      discount_last_money, other_money, status, 
+      link_number, tenant_id, delete_flag
+      )
    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR}, 
      #{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{handsPersonId,jdbcType=BIGINT}, 
-      #{creator,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, 
-      #{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, 
-      #{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
-      #{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, 
-      #{otherMoneyList,jdbcType=VARCHAR}, #{otherMoneyItem,jdbcType=VARCHAR}, #{accountDay,jdbcType=INTEGER}, 
-      #{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
-      #{deleteFlag,jdbcType=VARCHAR})
+      #{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, 
+      #{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL}, 
+      #{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR}, 
+      #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL}, 
+      #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, 
+      #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
    insert into jsh_depot_head
@@ -180,9 +173,6 @@
      <if test="organId != null">
        organ_id,
      </if>
-      <if test="handsPersonId != null">
-        hands_person_id,
-      </if>
      <if test="creator != null">
        creator,
      </if>
@@ -228,15 +218,6 @@
      <if test="otherMoney != null">
        other_money,
      </if>
-      <if test="otherMoneyList != null">
-        other_money_list,
-      </if>
-      <if test="otherMoneyItem != null">
-        other_money_item,
-      </if>
-      <if test="accountDay != null">
-        account_day,
-      </if>
      <if test="status != null">
        status,
      </if>
@@ -275,9 +256,6 @@
      <if test="organId != null">
        #{organId,jdbcType=BIGINT},
      </if>
-      <if test="handsPersonId != null">
-        #{handsPersonId,jdbcType=BIGINT},
-      </if>
      <if test="creator != null">
        #{creator,jdbcType=BIGINT},
      </if>
@@ -323,15 +301,6 @@
      <if test="otherMoney != null">
        #{otherMoney,jdbcType=DECIMAL},
      </if>
-      <if test="otherMoneyList != null">
-        #{otherMoneyList,jdbcType=VARCHAR},
-      </if>
-      <if test="otherMoneyItem != null">
-        #{otherMoneyItem,jdbcType=VARCHAR},
-      </if>
-      <if test="accountDay != null">
-        #{accountDay,jdbcType=INTEGER},
-      </if>
      <if test="status != null">
        #{status,jdbcType=VARCHAR},
      </if>
@@ -379,9 +348,6 @@
      <if test="record.organId != null">
        organ_id = #{record.organId,jdbcType=BIGINT},
      </if>
-      <if test="record.handsPersonId != null">
-        hands_person_id = #{record.handsPersonId,jdbcType=BIGINT},
-      </if>
      <if test="record.creator != null">
        creator = #{record.creator,jdbcType=BIGINT},
      </if>
@@ -427,15 +393,6 @@
      <if test="record.otherMoney != null">
        other_money = #{record.otherMoney,jdbcType=DECIMAL},
      </if>
-      <if test="record.otherMoneyList != null">
-        other_money_list = #{record.otherMoneyList,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherMoneyItem != null">
-        other_money_item = #{record.otherMoneyItem,jdbcType=VARCHAR},
-      </if>
-      <if test="record.accountDay != null">
-        account_day = #{record.accountDay,jdbcType=INTEGER},
-      </if>
      <if test="record.status != null">
        status = #{record.status,jdbcType=VARCHAR},
      </if>
@@ -463,7 +420,6 @@
      create_time = #{record.createTime,jdbcType=TIMESTAMP},
      oper_time = #{record.operTime,jdbcType=TIMESTAMP},
      organ_id = #{record.organId,jdbcType=BIGINT},
-      hands_person_id = #{record.handsPersonId,jdbcType=BIGINT},
      creator = #{record.creator,jdbcType=BIGINT},
      account_id = #{record.accountId,jdbcType=BIGINT},
      change_amount = #{record.changeAmount,jdbcType=DECIMAL},
@@ -479,9 +435,6 @@
      discount_money = #{record.discountMoney,jdbcType=DECIMAL},
      discount_last_money = #{record.discountLastMoney,jdbcType=DECIMAL},
      other_money = #{record.otherMoney,jdbcType=DECIMAL},
-      other_money_list = #{record.otherMoneyList,jdbcType=VARCHAR},
-      other_money_item = #{record.otherMoneyItem,jdbcType=VARCHAR},
-      account_day = #{record.accountDay,jdbcType=INTEGER},
      status = #{record.status,jdbcType=VARCHAR},
      link_number = #{record.linkNumber,jdbcType=VARCHAR},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -514,9 +467,6 @@
      <if test="organId != null">
        organ_id = #{organId,jdbcType=BIGINT},
      </if>
-      <if test="handsPersonId != null">
-        hands_person_id = #{handsPersonId,jdbcType=BIGINT},
-      </if>
      <if test="creator != null">
        creator = #{creator,jdbcType=BIGINT},
      </if>
@@ -562,15 +512,6 @@
      <if test="otherMoney != null">
        other_money = #{otherMoney,jdbcType=DECIMAL},
      </if>
-      <if test="otherMoneyList != null">
-        other_money_list = #{otherMoneyList,jdbcType=VARCHAR},
-      </if>
-      <if test="otherMoneyItem != null">
-        other_money_item = #{otherMoneyItem,jdbcType=VARCHAR},
-      </if>
-      <if test="accountDay != null">
-        account_day = #{accountDay,jdbcType=INTEGER},
-      </if>
      <if test="status != null">
        status = #{status,jdbcType=VARCHAR},
      </if>
@@ -595,7 +536,6 @@
      create_time = #{createTime,jdbcType=TIMESTAMP},
      oper_time = #{operTime,jdbcType=TIMESTAMP},
      organ_id = #{organId,jdbcType=BIGINT},
-      hands_person_id = #{handsPersonId,jdbcType=BIGINT},
      creator = #{creator,jdbcType=BIGINT},
      account_id = #{accountId,jdbcType=BIGINT},
      change_amount = #{changeAmount,jdbcType=DECIMAL},
@@ -611,9 +551,6 @@
      discount_money = #{discountMoney,jdbcType=DECIMAL},
      discount_last_money = #{discountLastMoney,jdbcType=DECIMAL},
      other_money = #{otherMoney,jdbcType=DECIMAL},
-      other_money_list = #{otherMoneyList,jdbcType=VARCHAR},
-      other_money_item = #{otherMoneyItem,jdbcType=VARCHAR},
-      account_day = #{accountDay,jdbcType=INTEGER},
      status = #{status,jdbcType=VARCHAR},
      link_number = #{linkNumber,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml
@@ -13,18 +13,11 @@
    <result column="tax_unit_price" jdbcType="DECIMAL" property="taxUnitPrice" />
    <result column="all_price" jdbcType="DECIMAL" property="allPrice" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="img" jdbcType="VARCHAR" property="img" />
-    <result column="incidentals" jdbcType="DECIMAL" property="incidentals" />
    <result column="depot_id" jdbcType="BIGINT" property="depotId" />
    <result column="another_depot_id" jdbcType="BIGINT" property="anotherDepotId" />
    <result column="tax_rate" jdbcType="DECIMAL" property="taxRate" />
    <result column="tax_money" jdbcType="DECIMAL" property="taxMoney" />
    <result column="tax_last_money" jdbcType="DECIMAL" property="taxLastMoney" />
-    <result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
-    <result column="other_field2" jdbcType="VARCHAR" property="otherField2" />
-    <result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
-    <result column="other_field4" jdbcType="VARCHAR" property="otherField4" />
-    <result column="other_field5" jdbcType="VARCHAR" property="otherField5" />
    <result column="material_type" jdbcType="VARCHAR" property="materialType" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
@@ -89,9 +82,8 @@
  </sql>
  <sql id="Base_Column_List">
    id, header_id, material_id, material_extend_id, material_unit, oper_number, basic_number, 
-    unit_price, tax_unit_price, all_price, remark, img, incidentals, depot_id, another_depot_id, 
-    tax_rate, tax_money, tax_last_money, other_field1, other_field2, other_field3, other_field4, 
-    other_field5, material_type, tenant_id, delete_flag
+    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
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
    select
@@ -127,21 +119,17 @@
    insert into jsh_depot_item (id, header_id, material_id, 
      material_extend_id, material_unit, oper_number, 
      basic_number, unit_price, tax_unit_price, 
-      all_price, remark, img, 
-      incidentals, depot_id, another_depot_id, 
-      tax_rate, tax_money, tax_last_money, 
-      other_field1, other_field2, other_field3, 
-      other_field4, other_field5, material_type, 
-      tenant_id, delete_flag)
+      all_price, remark, depot_id, 
+      another_depot_id, tax_rate, tax_money, 
+      tax_last_money, material_type, tenant_id, 
+      delete_flag)
    values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, 
      #{materialExtendId,jdbcType=BIGINT}, #{materialUnit,jdbcType=VARCHAR}, #{operNumber,jdbcType=DECIMAL}, 
      #{basicNumber,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL}, #{taxUnitPrice,jdbcType=DECIMAL}, 
-      #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, 
-      #{incidentals,jdbcType=DECIMAL}, #{depotId,jdbcType=BIGINT}, #{anotherDepotId,jdbcType=BIGINT}, 
-      #{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, #{taxLastMoney,jdbcType=DECIMAL}, 
-      #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, 
-      #{otherField4,jdbcType=VARCHAR}, #{otherField5,jdbcType=VARCHAR}, #{materialType,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+      #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{depotId,jdbcType=BIGINT}, 
+      #{anotherDepotId,jdbcType=BIGINT}, #{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, 
+      #{taxLastMoney,jdbcType=DECIMAL}, #{materialType,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
    insert into jsh_depot_item
@@ -179,12 +167,6 @@
      <if test="remark != null">
        remark,
      </if>
-      <if test="img != null">
-        img,
-      </if>
-      <if test="incidentals != null">
-        incidentals,
-      </if>
      <if test="depotId != null">
        depot_id,
      </if>
@@ -200,21 +182,6 @@
      <if test="taxLastMoney != null">
        tax_last_money,
      </if>
-      <if test="otherField1 != null">
-        other_field1,
-      </if>
-      <if test="otherField2 != null">
-        other_field2,
-      </if>
-      <if test="otherField3 != null">
-        other_field3,
-      </if>
-      <if test="otherField4 != null">
-        other_field4,
-      </if>
-      <if test="otherField5 != null">
-        other_field5,
-      </if>
      <if test="materialType != null">
        material_type,
      </if>
@@ -259,12 +226,6 @@
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
      </if>
-      <if test="img != null">
-        #{img,jdbcType=VARCHAR},
-      </if>
-      <if test="incidentals != null">
-        #{incidentals,jdbcType=DECIMAL},
-      </if>
      <if test="depotId != null">
        #{depotId,jdbcType=BIGINT},
      </if>
@@ -280,21 +241,6 @@
      <if test="taxLastMoney != null">
        #{taxLastMoney,jdbcType=DECIMAL},
      </if>
-      <if test="otherField1 != null">
-        #{otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField2 != null">
-        #{otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField3 != null">
-        #{otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField4 != null">
-        #{otherField4,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField5 != null">
-        #{otherField5,jdbcType=VARCHAR},
-      </if>
      <if test="materialType != null">
        #{materialType,jdbcType=VARCHAR},
      </if>
@@ -348,12 +294,6 @@
      <if test="record.remark != null">
        remark = #{record.remark,jdbcType=VARCHAR},
      </if>
-      <if test="record.img != null">
-        img = #{record.img,jdbcType=VARCHAR},
-      </if>
-      <if test="record.incidentals != null">
-        incidentals = #{record.incidentals,jdbcType=DECIMAL},
-      </if>
      <if test="record.depotId != null">
        depot_id = #{record.depotId,jdbcType=BIGINT},
      </if>
@@ -369,21 +309,6 @@
      <if test="record.taxLastMoney != null">
        tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL},
      </if>
-      <if test="record.otherField1 != null">
-        other_field1 = #{record.otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField2 != null">
-        other_field2 = #{record.otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField3 != null">
-        other_field3 = #{record.otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField4 != null">
-        other_field4 = #{record.otherField4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField5 != null">
-        other_field5 = #{record.otherField5,jdbcType=VARCHAR},
-      </if>
      <if test="record.materialType != null">
        material_type = #{record.materialType,jdbcType=VARCHAR},
      </if>
@@ -411,18 +336,11 @@
      tax_unit_price = #{record.taxUnitPrice,jdbcType=DECIMAL},
      all_price = #{record.allPrice,jdbcType=DECIMAL},
      remark = #{record.remark,jdbcType=VARCHAR},
-      img = #{record.img,jdbcType=VARCHAR},
-      incidentals = #{record.incidentals,jdbcType=DECIMAL},
      depot_id = #{record.depotId,jdbcType=BIGINT},
      another_depot_id = #{record.anotherDepotId,jdbcType=BIGINT},
      tax_rate = #{record.taxRate,jdbcType=DECIMAL},
      tax_money = #{record.taxMoney,jdbcType=DECIMAL},
      tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL},
-      other_field1 = #{record.otherField1,jdbcType=VARCHAR},
-      other_field2 = #{record.otherField2,jdbcType=VARCHAR},
-      other_field3 = #{record.otherField3,jdbcType=VARCHAR},
-      other_field4 = #{record.otherField4,jdbcType=VARCHAR},
-      other_field5 = #{record.otherField5,jdbcType=VARCHAR},
      material_type = #{record.materialType,jdbcType=VARCHAR},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
@@ -463,12 +381,6 @@
      <if test="remark != null">
        remark = #{remark,jdbcType=VARCHAR},
      </if>
-      <if test="img != null">
-        img = #{img,jdbcType=VARCHAR},
-      </if>
-      <if test="incidentals != null">
-        incidentals = #{incidentals,jdbcType=DECIMAL},
-      </if>
      <if test="depotId != null">
        depot_id = #{depotId,jdbcType=BIGINT},
      </if>
@@ -484,21 +396,6 @@
      <if test="taxLastMoney != null">
        tax_last_money = #{taxLastMoney,jdbcType=DECIMAL},
      </if>
-      <if test="otherField1 != null">
-        other_field1 = #{otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField2 != null">
-        other_field2 = #{otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField3 != null">
-        other_field3 = #{otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField4 != null">
-        other_field4 = #{otherField4,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField5 != null">
-        other_field5 = #{otherField5,jdbcType=VARCHAR},
-      </if>
      <if test="materialType != null">
        material_type = #{materialType,jdbcType=VARCHAR},
      </if>
@@ -523,18 +420,11 @@
      tax_unit_price = #{taxUnitPrice,jdbcType=DECIMAL},
      all_price = #{allPrice,jdbcType=DECIMAL},
      remark = #{remark,jdbcType=VARCHAR},
-      img = #{img,jdbcType=VARCHAR},
-      incidentals = #{incidentals,jdbcType=DECIMAL},
      depot_id = #{depotId,jdbcType=BIGINT},
      another_depot_id = #{anotherDepotId,jdbcType=BIGINT},
      tax_rate = #{taxRate,jdbcType=DECIMAL},
      tax_money = #{taxMoney,jdbcType=DECIMAL},
      tax_last_money = #{taxLastMoney,jdbcType=DECIMAL},
-      other_field1 = #{otherField1,jdbcType=VARCHAR},
-      other_field2 = #{otherField2,jdbcType=VARCHAR},
-      other_field3 = #{otherField3,jdbcType=VARCHAR},
-      other_field4 = #{otherField4,jdbcType=VARCHAR},
-      other_field5 = #{otherField5,jdbcType=VARCHAR},
      material_type = #{materialType,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapper.xml
@@ -6,6 +6,7 @@
    <result column="material_id" jdbcType="BIGINT" property="materialId" />
    <result column="bar_code" jdbcType="VARCHAR" property="barCode" />
    <result column="commodity_unit" jdbcType="VARCHAR" property="commodityUnit" />
+    <result column="sku" jdbcType="VARCHAR" property="sku" />
    <result column="purchase_decimal" jdbcType="DECIMAL" property="purchaseDecimal" />
    <result column="commodity_decimal" jdbcType="DECIMAL" property="commodityDecimal" />
    <result column="wholesale_decimal" jdbcType="DECIMAL" property="wholesaleDecimal" />
@@ -77,9 +78,9 @@
    </where>
  </sql>
  <sql id="Base_Column_List">
-    id, material_id, bar_code, commodity_unit, purchase_decimal, commodity_decimal, wholesale_decimal, 
-    low_decimal, default_flag, create_time, create_serial, update_serial, update_time, 
-    tenant_id, delete_Flag
+    id, material_id, bar_code, commodity_unit, sku, purchase_decimal, commodity_decimal, 
+    wholesale_decimal, low_decimal, default_flag, create_time, create_serial, update_serial, 
+    update_time, tenant_id, delete_Flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExtendExample" resultMap="BaseResultMap">
    select
@@ -113,17 +114,17 @@
  </delete>
  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialExtend">
    insert into jsh_material_extend (id, material_id, bar_code, 
-      commodity_unit, purchase_decimal, commodity_decimal, 
-      wholesale_decimal, low_decimal, default_flag, 
-      create_time, create_serial, update_serial, 
-      update_time, tenant_id, delete_Flag
-      )
+      commodity_unit, sku, purchase_decimal, 
+      commodity_decimal, wholesale_decimal, low_decimal, 
+      default_flag, create_time, create_serial, 
+      update_serial, update_time, tenant_id, 
+      delete_Flag)
    values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{barCode,jdbcType=VARCHAR}, 
-      #{commodityUnit,jdbcType=VARCHAR}, #{purchaseDecimal,jdbcType=DECIMAL}, #{commodityDecimal,jdbcType=DECIMAL}, 
-      #{wholesaleDecimal,jdbcType=DECIMAL}, #{lowDecimal,jdbcType=DECIMAL}, #{defaultFlag,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createSerial,jdbcType=VARCHAR}, #{updateSerial,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
-      )
+      #{commodityUnit,jdbcType=VARCHAR}, #{sku,jdbcType=VARCHAR}, #{purchaseDecimal,jdbcType=DECIMAL}, 
+      #{commodityDecimal,jdbcType=DECIMAL}, #{wholesaleDecimal,jdbcType=DECIMAL}, #{lowDecimal,jdbcType=DECIMAL}, 
+      #{defaultFlag,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createSerial,jdbcType=VARCHAR}, 
+      #{updateSerial,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialExtend">
    insert into jsh_material_extend
@@ -140,6 +141,9 @@
      <if test="commodityUnit != null">
        commodity_unit,
      </if>
+      <if test="sku != null">
+        sku,
+      </if>
      <if test="purchaseDecimal != null">
        purchase_decimal,
      </if>
@@ -187,6 +191,9 @@
      <if test="commodityUnit != null">
        #{commodityUnit,jdbcType=VARCHAR},
      </if>
+      <if test="sku != null">
+        #{sku,jdbcType=VARCHAR},
+      </if>
      <if test="purchaseDecimal != null">
        #{purchaseDecimal,jdbcType=DECIMAL},
      </if>
@@ -243,6 +250,9 @@
      <if test="record.commodityUnit != null">
        commodity_unit = #{record.commodityUnit,jdbcType=VARCHAR},
      </if>
+      <if test="record.sku != null">
+        sku = #{record.sku,jdbcType=VARCHAR},
+      </if>
      <if test="record.purchaseDecimal != null">
        purchase_decimal = #{record.purchaseDecimal,jdbcType=DECIMAL},
      </if>
@@ -287,6 +297,7 @@
      material_id = #{record.materialId,jdbcType=BIGINT},
      bar_code = #{record.barCode,jdbcType=VARCHAR},
      commodity_unit = #{record.commodityUnit,jdbcType=VARCHAR},
+      sku = #{record.sku,jdbcType=VARCHAR},
      purchase_decimal = #{record.purchaseDecimal,jdbcType=DECIMAL},
      commodity_decimal = #{record.commodityDecimal,jdbcType=DECIMAL},
      wholesale_decimal = #{record.wholesaleDecimal,jdbcType=DECIMAL},
@@ -314,6 +325,9 @@
      <if test="commodityUnit != null">
        commodity_unit = #{commodityUnit,jdbcType=VARCHAR},
      </if>
+      <if test="sku != null">
+        sku = #{sku,jdbcType=VARCHAR},
+      </if>
      <if test="purchaseDecimal != null">
        purchase_decimal = #{purchaseDecimal,jdbcType=DECIMAL},
      </if>
@@ -355,6 +369,7 @@
    set material_id = #{materialId,jdbcType=BIGINT},
      bar_code = #{barCode,jdbcType=VARCHAR},
      commodity_unit = #{commodityUnit,jdbcType=VARCHAR},
+      sku = #{sku,jdbcType=VARCHAR},
      purchase_decimal = #{purchaseDecimal,jdbcType=DECIMAL},
      commodity_decimal = #{commodityDecimal,jdbcType=DECIMAL},
      wholesale_decimal = #{wholesaleDecimal,jdbcType=DECIMAL},
--- a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapper.xml
@@ -4,7 +4,6 @@
  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Organization">
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="org_no" jdbcType="VARCHAR" property="orgNo" />
-    <result column="org_full_name" jdbcType="VARCHAR" property="orgFullName" />
    <result column="org_abr" jdbcType="VARCHAR" property="orgAbr" />
    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
    <result column="sort" jdbcType="VARCHAR" property="sort" />
@@ -73,8 +72,8 @@
    </where>
  </sql>
  <sql id="Base_Column_List">
-    id, org_no, org_full_name, org_abr, parent_id, sort, remark, create_time, update_time, 
-    tenant_id, delete_flag
+    id, org_no, org_abr, parent_id, sort, remark, create_time, update_time, tenant_id, 
+    delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.OrganizationExample" resultMap="BaseResultMap">
    select
@@ -107,14 +106,14 @@
    </if>
  </delete>
  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Organization">
-    insert into jsh_organization (id, org_no, org_full_name, 
-      org_abr, parent_id, sort, 
-      remark, create_time, update_time, 
-      tenant_id, delete_flag)
-    values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, 
-      #{orgAbr,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+    insert into jsh_organization (id, org_no, org_abr, 
+      parent_id, sort, remark, 
+      create_time, update_time, tenant_id, 
+      delete_flag)
+    values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgAbr,jdbcType=VARCHAR}, 
+      #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Organization">
    insert into jsh_organization
@@ -125,9 +124,6 @@
      <if test="orgNo != null">
        org_no,
      </if>
-      <if test="orgFullName != null">
-        org_full_name,
-      </if>
      <if test="orgAbr != null">
        org_abr,
      </if>
@@ -160,9 +156,6 @@
      <if test="orgNo != null">
        #{orgNo,jdbcType=VARCHAR},
      </if>
-      <if test="orgFullName != null">
-        #{orgFullName,jdbcType=VARCHAR},
-      </if>
      <if test="orgAbr != null">
        #{orgAbr,jdbcType=VARCHAR},
      </if>
@@ -204,9 +197,6 @@
      <if test="record.orgNo != null">
        org_no = #{record.orgNo,jdbcType=VARCHAR},
      </if>
-      <if test="record.orgFullName != null">
-        org_full_name = #{record.orgFullName,jdbcType=VARCHAR},
-      </if>
      <if test="record.orgAbr != null">
        org_abr = #{record.orgAbr,jdbcType=VARCHAR},
      </if>
@@ -240,7 +230,6 @@
    update jsh_organization
    set id = #{record.id,jdbcType=BIGINT},
      org_no = #{record.orgNo,jdbcType=VARCHAR},
-      org_full_name = #{record.orgFullName,jdbcType=VARCHAR},
      org_abr = #{record.orgAbr,jdbcType=VARCHAR},
      parent_id = #{record.parentId,jdbcType=BIGINT},
      sort = #{record.sort,jdbcType=VARCHAR},
@@ -259,9 +248,6 @@
      <if test="orgNo != null">
        org_no = #{orgNo,jdbcType=VARCHAR},
      </if>
-      <if test="orgFullName != null">
-        org_full_name = #{orgFullName,jdbcType=VARCHAR},
-      </if>
      <if test="orgAbr != null">
        org_abr = #{orgAbr,jdbcType=VARCHAR},
      </if>
@@ -292,7 +278,6 @@
  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Organization">
    update jsh_organization
    set org_no = #{orgNo,jdbcType=VARCHAR},
-      org_full_name = #{orgFullName,jdbcType=VARCHAR},
      org_abr = #{orgAbr,jdbcType=VARCHAR},
      parent_id = #{parentId,jdbcType=BIGINT},
      sort = #{sort,jdbcType=VARCHAR},
--- a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml
@@ -52,13 +52,11 @@
    <insert id="addOrganization" parameterType="com.jsh.erp.datasource.entities.Organization"
            useGeneratedKeys="true" keyProperty="id" keyColumn="id">
        insert into jsh_organization
-        (org_no, org_full_name,
-      org_abr, delete_flag,
+        (org_no, org_abr, delete_flag,
      parent_id, sort, remark,
      create_time, update_time)
        values
-        (#{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR},
-      #{orgAbr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR},
+        (#{orgNo,jdbcType=VARCHAR}, #{orgAbr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR},
      #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
    </insert>
@@ -74,8 +72,7 @@
    <update id="editOrganization">
      update jsh_organization
      set update_time=#{updateTime},
-      org_no = #{orgNo},org_full_name = #{orgFullName},
-      org_abr = #{orgAbr},
+      org_no = #{orgNo},org_abr = #{orgAbr},
      delete_flag = #{deleteFlag},parent_id = #{parentId},
      sort = #{sort},remark = #{remark}
      where id =#{id}