From 451ec80549117946e9eae80adebc75f11c0164fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Sat, 5 Jul 2025 09:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=8E=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../resources/mapper/job/MydoJobMapper.xml | 4 ++-- .../resources/mapper/stock/BasStockMapper.xml | 2 +- .../src/assets/styles/element-variables.scss | 6 ++--- ruoyi-ui/src/lang/en.js | 1 + ruoyi-ui/src/lang/zh.js | 1 + ruoyi-ui/src/views/check/flat/index.vue | 15 ++++++------ ruoyi-ui/src/views/out/addOutStockout.vue | 11 ++++++++- ruoyi-ui/src/views/out/outStockoutManage.vue | 8 +++---- .../src/views/search/StockSummary/index.vue | 10 ++++++++ .../search/ViewFlatWarehouseInFlow/index.vue | 10 ++++++++ .../search/ViewFlatWarehouseOutFlow/index.vue | 10 ++++++++ .../src/views/search/ViewInJobFlow/index.vue | 18 ++++++++++---- .../src/views/search/ViewOutJobFlow/index.vue | 18 ++++++++++---- .../views/search/ViewStockDetail/index.vue | 18 +++++++++++--- .../views/search/ViewStockSecure/index.vue | 24 +++++++++++++------ .../views/search/ViewStockWarning/index.vue | 20 +++++++++++++--- .../views/search/ViewStockinHistory/index.vue | 18 ++++++++++---- .../search/ViewStockoutHistory/index.vue | 10 ++++++++ ruoyi-ui/src/views/stock/management/index.vue | 14 +++++------ 20 files changed, 169 insertions(+), 51 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5ce11cc..8a611ed 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -72,7 +72,7 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 2 # 密码 password: 123456 # 连接超时时间 diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index c72173a..18f4b12 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -77,8 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mj.priority = #{priority} and mj.execution_phase = #{executionPhase} and mj.in_or_out = #{inOrOut} - and mj.start_time = #{startTime} - and mj.finish_time = #{finishTime} + and mj.start_time like concat('%', #{startTime}, '%') + and mj.finish_time like concat('%', #{finishTime}, '%') and mj.entrance_id = #{entranceId} and mj.exit_id = #{exitId} and mj.class_id = #{classId} diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml index 7be8472..c90d4a9 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bs.stock_status = #{stockStatus} and bs.product_status = #{productStatus} and bs.lot_no = #{lotNo} - and bs.in_date = #{inDate} + and bs.in_date like concat('%', #{inDate}, '%') and bs.back_date = #{backDate} and bs.product_guid = #{productGuid} and bp.product_name = #{productName} diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss index 1615ff2..964174a 100644 --- a/ruoyi-ui/src/assets/styles/element-variables.scss +++ b/ruoyi-ui/src/assets/styles/element-variables.scss @@ -4,9 +4,9 @@ **/ /* theme color */ -$--color-primary: #1890ff; -$--color-success: #13ce66; -$--color-warning: #ffba00; +$--color-primary: #2a7fff; +$--color-success: #5ec468; +$--color-warning: #f97e19; $--color-danger: #ff4949; // $--color-info: #1E1E1E; diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 43449a2..74f9320 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -334,6 +334,7 @@ export default { selectStartTime: 'Please select start time', finishTime: 'End Time', selectFinishTime: 'Please select end time', + createTime:'Create Time', // Location Information warehouse: 'Warehouse', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index a27521a..024ed34 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -304,6 +304,7 @@ export default { selectStartTime: '请选择开始时间', finishTime: '结束时间', selectFinishTime: '请选择结束时间', + createTime:'创建时间', // 位置信息 warehouse: '仓库', diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue index 9dbe41b..8f1d77b 100644 --- a/ruoyi-ui/src/views/check/flat/index.vue +++ b/ruoyi-ui/src/views/check/flat/index.vue @@ -47,13 +47,14 @@ /> --> - - + + + + @@ -745,3 +745,13 @@ export default { } } + diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue index 79380ae..588ac56 100644 --- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue @@ -205,16 +205,16 @@ @@ -775,3 +775,13 @@ export default { } } + diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue index c6038d7..60e5b13 100644 --- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue @@ -76,12 +76,14 @@ /> - + type="date" + value-format="yyyy-MM-dd" + @keyup.enter.native="handleQuery"> + @@ -571,3 +573,13 @@ export default { } } + diff --git a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue index 4236079..4b6017f 100644 --- a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue @@ -55,13 +55,13 @@ @keyup.enter.native="handleQuery" /> - - + + + + diff --git a/ruoyi-ui/src/views/search/ViewStockWarning/index.vue b/ruoyi-ui/src/views/search/ViewStockWarning/index.vue index 6ebddbe..477d600 100644 --- a/ruoyi-ui/src/views/search/ViewStockWarning/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockWarning/index.vue @@ -56,13 +56,17 @@ /> --> - + type="date" + value-format="yyyy-MM-dd" + @keyup.enter.native="handleQuery"> + + + @@ -747,3 +747,13 @@ export default { } } + diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue index 3a077c9..65bd3a0 100644 --- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue @@ -579,3 +579,13 @@ export default { } } + diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue index 193f537..6d08b94 100644 --- a/ruoyi-ui/src/views/stock/management/index.vue +++ b/ruoyi-ui/src/views/stock/management/index.vue @@ -47,13 +47,13 @@ /> - - + + +