增加关联明细id字段，解决明细中重复商品进行批次发货遇到的问题

jshERP-boot/src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -23,6 +23,7 @@
     <result column="sn_list" jdbcType="VARCHAR" property="snList" />
     <result column="batch_number" jdbcType="VARCHAR" property="batchNumber" />
     <result column="expiration_date" jdbcType="TIMESTAMP" property="expirationDate" />
+    <result column="link_id" jdbcType="BIGINT" property="linkId" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
@@ -88,7 +89,7 @@
     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, sn_list, batch_number, expiration_date, 
-    tenant_id, delete_flag
+    link_id, tenant_id, delete_flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
     select
@@ -128,7 +129,8 @@
       depot_id, another_depot_id, tax_rate, 
       tax_money, tax_last_money, material_type, 
       sn_list, batch_number, expiration_date, 
-      tenant_id, delete_flag)
+      link_id, tenant_id, delete_flag
+      )
     values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, 
       #{materialExtendId,jdbcType=BIGINT}, #{materialUnit,jdbcType=VARCHAR}, #{sku,jdbcType=VARCHAR}, 
       #{operNumber,jdbcType=DECIMAL}, #{basicNumber,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL}, 
@@ -136,7 +138,8 @@
       #{depotId,jdbcType=BIGINT}, #{anotherDepotId,jdbcType=BIGINT}, #{taxRate,jdbcType=DECIMAL}, 
       #{taxMoney,jdbcType=DECIMAL}, #{taxLastMoney,jdbcType=DECIMAL}, #{materialType,jdbcType=VARCHAR}, 
       #{snList,jdbcType=VARCHAR}, #{batchNumber,jdbcType=VARCHAR}, #{expirationDate,jdbcType=TIMESTAMP}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+      #{linkId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
     insert into jsh_depot_item
@@ -204,6 +207,9 @@
       <if test="expirationDate != null">
         expiration_date,
       </if>
+      <if test="linkId != null">
+        link_id,
+      </if>
       <if test="tenantId != null">
         tenant_id,
       </if>
@@ -275,6 +281,9 @@
       <if test="expirationDate != null">
         #{expirationDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="linkId != null">
+        #{linkId,jdbcType=BIGINT},
+      </if>
       <if test="tenantId != null">
         #{tenantId,jdbcType=BIGINT},
       </if>
@@ -355,6 +364,9 @@
       <if test="record.expirationDate != null">
         expiration_date = #{record.expirationDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.linkId != null">
+        link_id = #{record.linkId,jdbcType=BIGINT},
+      </if>
       <if test="record.tenantId != null">
         tenant_id = #{record.tenantId,jdbcType=BIGINT},
       </if>
@@ -389,6 +401,7 @@
       sn_list = #{record.snList,jdbcType=VARCHAR},
       batch_number = #{record.batchNumber,jdbcType=VARCHAR},
       expiration_date = #{record.expirationDate,jdbcType=TIMESTAMP},
+      link_id = #{record.linkId,jdbcType=BIGINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -458,6 +471,9 @@
       <if test="expirationDate != null">
         expiration_date = #{expirationDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="linkId != null">
+        link_id = #{linkId,jdbcType=BIGINT},
+      </if>
       <if test="tenantId != null">
         tenant_id = #{tenantId,jdbcType=BIGINT},
       </if>
@@ -489,6 +505,7 @@
       sn_list = #{snList,jdbcType=VARCHAR},
       batch_number = #{batchNumber,jdbcType=VARCHAR},
       expiration_date = #{expirationDate,jdbcType=TIMESTAMP},
+      link_id = #{linkId,jdbcType=BIGINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       delete_flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}

jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -598,6 +598,7 @@
     <select id="getFinishNumber" resultType="java.math.BigDecimal">
         select ifnull(sum(di.basic_number),0) from jsh_depot_item di
         where di.material_extend_id=#{meId}
+        and di.link_id=#{linkId}
         and ifnull(di.delete_flag,'0') !='1'
         and di.header_id
         in
@@ -615,6 +616,7 @@
     <select id="getRealFinishNumber" resultType="java.math.BigDecimal">
         select ifnull(sum(di.basic_number),0) from jsh_depot_item di
         where di.material_extend_id=#{meId}
+        and di.link_id=#{linkId}
         and ifnull(di.delete_flag,'0') !='1'
         and di.header_id
         in