From bb6ec4c7efd6f1fe4ac6e3a4c27eebadd27d1d07 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 1 Feb 2024 17:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E5=BA=9F=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/main.html | 65 +++++++- .../java/com/ruoyi/api/domain/StockDto.java | 9 ++ .../src/main/resources/mapper/ApiMapper.xml | 22 ++- .../controller/BaseAreaUserController.java | 1 + .../controller/LedgerRfidController.java | 7 + .../com/ruoyi/manage/domain/BaseAreaUser.java | 16 ++ .../ruoyi/manage/mapper/LedgerRfidMapper.java | 2 + .../manage/service/ILedgerRfidService.java | 2 + .../service/impl/LedgerRfidServiceImpl.java | 5 + .../mapper/manage/BaseAreaUserMapper.xml | 43 ++--- .../mapper/manage/LedgerRfidMapper.xml | 5 + .../templates/manage/base_area_user/add.html | 2 +- .../manage/base_area_user/base_area_user.html | 153 +++++++++--------- .../templates/manage/base_area_user/edit.html | 2 +- .../manage/ledger_rfid/ledger_rfid.html | 7 +- 15 files changed, 230 insertions(+), 111 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 9a1ab33..4481f0c 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -1,18 +1,79 @@ - + - 若依介绍 + + [ BGS ] + + + + + + + + + diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/domain/StockDto.java b/ruoyi-api/src/main/java/com/ruoyi/api/domain/StockDto.java index b75ff7d..c44b519 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/domain/StockDto.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/domain/StockDto.java @@ -9,6 +9,15 @@ public class StockDto { private String epcCode; private String locationCode; private String state; + private String createTime; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } public String getState() { return state; diff --git a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml index 44400ee..e0440ae 100644 --- a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml @@ -58,19 +58,17 @@ - + select row_number() over (order by lf.location_code) as 'index', + rifd_code as epcCode, + lf.location_code as locationCode, + lf.create_time as createTime, + '未检' as state from ledger_rfid lf - left join bg_wheel_chocks.base_location bl on lf.location_code = bl.location_code - left join bg_wheel_chocks.base_area_user bau on bl.store_id = bau.area_id - left join bg_wheel_chocks.sys_user su on bau.user_id = su.user_id - where su.login_name=#{user} and lf.is_scrap=1 + left join base_location bl on lf.location_code = bl.location_code + left join base_area_user bau on bl.store_id = bau.area_id + where user_id=#{user} + and is_scrap = 1 - - and bau.user_id = #{userId} - and area_id = #{areaId} + + and bau.user_id = #{userId} + and area_id = #{areaId} - + - + insert into base_area_user user_id, area_id, - + #{userId}, #{areaId}, - + @@ -54,11 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from base_area_user where objid = #{objid} + delete + from base_area_user + where objid = #{objid} - delete from base_area_user where objid in + delete from base_area_user where objid in #{objid} @@ -67,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml index 81c6fa4..53173d4 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" location_code, is_scrap, lr.update_time, + lr.create_time, bm.manufacturer_code, bm.manufacturer_name from ledger_rfid lr @@ -97,4 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html index 83c4b81..ffb7876 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html @@ -10,7 +10,7 @@
diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html index d990001..cc420b1 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html @@ -1,74 +1,81 @@ - + -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
+
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html index 2b2c9c8..9f3caf8 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html @@ -11,7 +11,7 @@
diff --git a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html index 9892642..2b3a779 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html +++ b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html @@ -139,7 +139,12 @@ { field: 'updateTime', title: '更新时间' - }/*, + }, + { + field: 'createTime', + title: '入场时间' + } + /*, { title: '操作', align: 'center',