From 1012c74fb9ae6dc2ef7b1eaf4a576413f52bbde9 Mon Sep 17 00:00:00 2001 From: liukewei Date: Thu, 21 Dec 2023 13:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E8=B5=84=E7=BB=BC?= =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ehs/EhsMaterialDetailController.java | 2 +- .../mapper/ehs/EhsMaterialDetailMapper.xml | 1 + ruoyi-ui/src/views/ehs/ehsMaterial/index.vue | 29 +- .../src/views/ehs/ehsMaterial/indexAll.vue | 567 ++++++++++++++++++ 4 files changed, 595 insertions(+), 4 deletions(-) create mode 100644 ruoyi-ui/src/views/ehs/ehsMaterial/indexAll.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java index 7fcfca6..4d8dfc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java @@ -106,7 +106,7 @@ public class EhsMaterialDetailController extends BaseController ehsMaterial = new EhsMaterial(); ehsMaterial.setMaterialQuantity(ehsMaterialDetail.getOperateType()==1?result2.toString():null); ehsMaterial.setMaterialId(ehsMaterialDetail.getMaterialId()); - ehsMaterialDetail.setInventory(result2); + ehsMaterialDetail.setInventory(ehsMaterialDetail.getOperateType()==1?result2:string1); ehsMaterialDetailService.save(ehsMaterialDetail);// return toAjax(ehsMaterialService.updateById(ehsMaterial)); } diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialDetailMapper.xml index ac3b062..bf0f18d 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialDetailMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialDetailMapper.xml @@ -47,6 +47,7 @@ and operate_type = #{operateType} and (outbound_user_id is null or outbound_user_id ='') + order by material_detail_id desc