From 4d24ddfbee276381b85357ed5437c9b823980b3c Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 2 Aug 2024 17:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 10 +- .../base/LedgerInstant/LedgerInstant.html | 143 ++++++++++-------- .../impl/LedgerInstantBindingServiceImpl.java | 6 +- .../system/LedgerInstantBindingMapper.xml | 5 +- 4 files changed, 87 insertions(+), 77 deletions(-) diff --git a/bgs-admin/src/main/resources/application-druid.yml b/bgs-admin/src/main/resources/application-druid.yml index ba34a5c..5ace456 100644 --- a/bgs-admin/src/main/resources/application-druid.yml +++ b/bgs-admin/src/main/resources/application-druid.yml @@ -6,12 +6,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: haiwei@123 - url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: Haiwei@123 #150 + password: haiwei@123 +# url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true +# username: root +# password: Haiwei@123 #150 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/bgs-admin/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html b/bgs-admin/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html index 05ca040..7bf7109 100644 --- a/bgs-admin/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html +++ b/bgs-admin/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html @@ -1,74 +1,80 @@ - + -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
+
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/bgs-system/src/main/java/com/bgs/system/service/impl/LedgerInstantBindingServiceImpl.java b/bgs-system/src/main/java/com/bgs/system/service/impl/LedgerInstantBindingServiceImpl.java index cbb283f..32a2dde 100644 --- a/bgs-system/src/main/java/com/bgs/system/service/impl/LedgerInstantBindingServiceImpl.java +++ b/bgs-system/src/main/java/com/bgs/system/service/impl/LedgerInstantBindingServiceImpl.java @@ -44,9 +44,9 @@ public class LedgerInstantBindingServiceImpl implements ILedgerInstantBindingSer @Override public List selectLedgerInstantBindingList(LedgerInstantBinding ledgerInstantBinding) { - if(StringUtils.isEmpty(ledgerInstantBinding.getCargoFrameEpc())){ - return new ArrayList(); - } + // if(StringUtils.isEmpty(ledgerInstantBinding.getCargoFrameEpc())){ + // return new ArrayList(); + // } return ledgerInstantBindingMapper.selectLedgerInstantBindingList(ledgerInstantBinding); } diff --git a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml index 1f31e13..02fea9c 100644 --- a/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml +++ b/bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -18,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"