From 0009e182051c914649319ec97ef7a7c321019d1b Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 15 Mar 2024 11:00:31 +0800 Subject: [PATCH] '123' --- .../storageLocationController.java | 4 +- .../domain/StorageLocation.java | 9 + .../storageLocation/StorageLocationMapper.xml | 8 +- .../storageLocation/locationConsuming.vue | 720 ++++++++++-------- .../src/views/storageLocation/locationSet.vue | 106 +-- 5 files changed, 457 insertions(+), 390 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java index b38976d..0e6e451 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/storageLocation/storageLocationController.java @@ -84,7 +84,7 @@ public class storageLocationController extends BaseController @PostMapping("/checkStorageLocation") public AjaxResult checkStorageLocation(@RequestBody StorageLocation storageLocation) { - String storageExpire = configService.selectConfigByKey("storage.expire"); + String storageExpire = configService.selectConfigByKey("storage.expire.zy"); String user_name = getLoginUser().getUsername();//当前登陆者 String materialBh = storageLocation.getMaterialBh(); @@ -105,8 +105,6 @@ public class storageLocationController extends BaseController @PostMapping("/cancelStorageLocation") public AjaxResult cancelStorageLocation(@RequestBody StorageLocation storageLocation) { - String storageExpire = configService.selectConfigByKey("storage.expire"); - String user_name = getLoginUser().getUsername();//当前登陆者 String materialBh = storageLocation.getMaterialBh(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/storageLocation/domain/StorageLocation.java b/ruoyi-system/src/main/java/com/ruoyi/storageLocation/domain/StorageLocation.java index feb518d..59d2804 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/storageLocation/domain/StorageLocation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/storageLocation/domain/StorageLocation.java @@ -13,6 +13,7 @@ public class StorageLocation extends BaseEntity private static final long serialVersionUID = 1L; private String materialBh; + private String materialZlh; private String materialXingh; private String materialGuig; private String materialDiany; @@ -27,6 +28,14 @@ public class StorageLocation extends BaseEntity this.materialBh = materialBh; } + public String getMaterialZlh() { + return materialZlh; + } + + public void setMaterialZlh(String materialZlh) { + this.materialZlh = materialZlh; + } + public String getMaterialXingh() { return materialXingh; } diff --git a/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml index da40667..ead1c72 100644 --- a/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -14,21 +15,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update storageLocation + materialZlh = #{materialZlh}, materialXingh = #{materialXingh}, materialGuig = #{materialGuig}, materialDiany = #{materialDiany}, diff --git a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue index 504120d..3209e24 100644 --- a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue +++ b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue @@ -1,202 +1,240 @@