优化序列号和批号选择列表的接口

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

@@ -687,8 +687,7 @@
         select id, bar_code, name, standard, model, batch_number, expiration_date, sum(oper_number) total_num  from
         (select di.batch_number id, me.bar_code, m.name, m.standard, m.model,di.batch_number,di.expiration_date,
         di.oper_number*(case dh.type when '入库' then 1 when '出库' then -1 end) as oper_number
-        from
-        jsh_depot_head dh
+        from jsh_depot_head dh
         left join jsh_depot_item di on dh.id=di.header_id
         left join jsh_material m on m.id=di.material_id and ifnull(m.delete_flag, '0') != '1'
         left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1'
@@ -703,6 +702,9 @@
         <if test="batchNumber != null">
             and di.batch_number= #{batchNumber}
         </if>
+        <if test="number != null">
+            and dh.number!= #{number}
+        </if>
         and m.enable_batch_number =1
         and di.delete_flag!=1) tb
         group by batch_number

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

@@ -158,9 +158,9 @@
         )
     </update>
 
-    <select id="getEnableSerialNumberList" resultMap="com.jsh.erp.datasource.mappers.SerialNumberMapper.BaseResultMap">
+    <select id="getEnableSerialNumberList" resultType="com.jsh.erp.datasource.entities.SerialNumberEx">
         select
-        ser.id, ser.serial_number
+        ser.id, ser.serial_number, ser.in_bill_no, ser.create_time, ser.update_time
         FROM jsh_serial_number ser
         left join jsh_material m on m.id=ser.material_id and ifnull(m.delete_flag, '0') != '1'
         left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1'
@@ -175,7 +175,11 @@
         <if test="barCode != null">
             and me.bar_code= #{barCode}
         </if>
-        and ser.is_sell = '0'
+        and (ser.is_sell = '0'
+        <if test="number != null">
+            or ser.out_bill_no = #{number}
+        </if>
+        )
         and ifnull(ser.delete_flag,'0') !='1'
         order by ser.id desc
         <if test="offset != null and rows != null">
@@ -199,7 +203,11 @@
         <if test="barCode != null">
             and me.bar_code= #{barCode}
         </if>
-        and ser.is_sell = '0'
+        and (ser.is_sell = '0'
+        <if test="number != null">
+            or ser.out_bill_no = #{number}
+        </if>
+        )
         and ifnull(ser.delete_flag,'0') !='1'
     </select>
 </mapper>