Merge branch 'master' into dev

2025-03-25 11:47:02 +08:00 · 2025-03-25 11:47:02 +08:00 · 798664dbf8
commit 798664dbf8
parent 9224928652 de4056573b
1 changed files with 2 additions and 1 deletions
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@ -1043,7 +1043,8 @@
        </if>
        and m.enable_batch_number =1
        and di.delete_flag!=1) tb
-        group by batch_number
+        group by id, bar_code, name, standard, model, unit_id,
+        commodity_unit, batch_number, expiration_date
        order by expiration_date asc
    </select>