发31

2026-07-07 09:34:59 +08:00
parent 442ca4977c
commit 81cd4b3317
7 changed files with 8 additions and 8 deletions
@@ -16,7 +16,7 @@ spring:
 #        server-addr: 127.0.0.1:8848
 #        server-addr: 10.33.0.129:6010
      #        线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.31:6848
        username: nacos
        password: manhuoda@2023
      #线上正式环境
@@ -25,7 +25,7 @@ spring:
 #        server-addr: 127.0.0.1:8848
 #        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.31:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO,nvl(a.unit_name,b.unit_name) as unit_name,
        a.bar_code as inv_bar_code,
        a.in_order_number,a.lot_number,
-        sort_order as sort_order
+        CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END as sort_order
    </sql>

    <!-- 按物料(wl)汇总：仓库/库区/库位取创建时间最新的一条明细（与 queryListByWl 中 loc 子查询一致；并列时取 material_inventory_id 更大） -->