From b25f591b267c811817d0505fa953d3a4b9682258 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Fri, 27 Dec 2024 14:15:03 +0800 Subject: [PATCH] =?UTF-8?q?24-12-27=20=E6=A0=87=E7=AD=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/production/entity/OutboundLabelScan.java | 2 ++ src/main/resources/application-test.yml | 12 ++++++------ .../mapper/production/OutboundLabelScanMapper.xml | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/heai/modules/production/entity/OutboundLabelScan.java b/src/main/java/com/heai/modules/production/entity/OutboundLabelScan.java index caaeda2..c4256b8 100644 --- a/src/main/java/com/heai/modules/production/entity/OutboundLabelScan.java +++ b/src/main/java/com/heai/modules/production/entity/OutboundLabelScan.java @@ -58,5 +58,7 @@ public class OutboundLabelScan implements Serializable { private Long printId; + private BigDecimal weight; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 54ec865..b66b925 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -4,12 +4,12 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource # url: jdbc:sqlserver://xujiesoft.vicp.net:11512;databaseName=SHHS -# url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SHHS - url: jdbc:sqlserver://192.168.2.172:1433;databaseName=XJERP -# username: xjsoft -# password: XsoftJ123 - username: sa - password: SHhsadmin123@ + url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SHHS +# url: jdbc:sqlserver://192.168.2.172:1433;databaseName=XJERP + username: xjsoft + password: XsoftJ123 +# username: sa +# password: SHhsadmin123@ initial-size: 10 max-active: 100 min-idle: 10 diff --git a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml index fe3d509..97e7aca 100644 --- a/src/main/resources/mapper/production/OutboundLabelScanMapper.xml +++ b/src/main/resources/mapper/production/OutboundLabelScanMapper.xml @@ -65,9 +65,10 @@ create_by, create_data, olc.seq_no, - plr.item_no as print_id + plr.item_no as print_id, + olc.weight from outbound_label_scan olc - left join print_label_record plr on olc.print_id = plr.id + left join print_label_record plr on olc.print_id = plr.id and olc.site = #{site}