From bce324b42e0f6df7a8d6fcf08ff9eb363aa0d879 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Thu, 20 Jun 2024 09:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E6=9F=9C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/mapper/RecycleDeviceMapper.java | 2 +- .../jnpf/service/RecycleDeviceService.java | 2 +- .../impl/RecycleDeviceServiceImpl.java | 19 +-- .../controller/RecycleDeviceController.java | 15 +- .../java/jnpf/entity/RecycleDeviceEntity.java | 18 ++- .../entity/RecycleStationStaffEntity.java | 1 - .../recycledevice/RecycleDeviceConstant.java | 10 +- .../recycledevice/RecycleDeviceForm.java | 12 +- .../RecycleDevicePagination.java | 2 +- .../src/views/recycledevice/Detail.vue | 66 ++++++--- .../src/views/recycledevice/columnList.js | 2 +- .../jnpf-web/src/views/recycledevice/form.vue | 129 +++++++++++++----- .../src/views/recycledevice/index.vue | 18 ++- .../src/views/recycledevice/superQueryJson.js | 2 +- 14 files changed, 193 insertions(+), 105 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceMapper.java index 208552d..fe15e19 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceMapper.java @@ -5,7 +5,7 @@ import jnpf.entity.RecycleDeviceEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 设备清单 + * RecycleDevice * 版本: V3.5 * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) * 作者: JNPF开发平台组 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceService.java index dab6c21..84a7bce 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** - * 设备清单 + * RecycleDevice * 版本: V3.5 * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) * 作者: JNPF开发平台组 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java index f5ec740..dec9a20 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java @@ -32,7 +32,7 @@ import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; /** * - * 设备清单 + * RecycleDevice * 版本: V3.5 * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) * 作者: JNPF开发平台组 @@ -113,7 +113,7 @@ public class RecycleDeviceServiceImpl extends ServiceImpl finalAllRuleIDlist = allRuleIDlist; recycleDeviceQueryWrapper.lambda().and(t->t.in(RecycleDeviceEntity::getId, finalAllRuleIDlist)); } + //假删除标志 + recycleDeviceQueryWrapper.lambda().isNull(RecycleDeviceEntity::getDeleteMark); //排序 if(StringUtil.isEmpty(recycleDevicePagination.getSidx())){ @@ -288,20 +290,9 @@ public class RecycleDeviceServiceImpl extends ServiceImpl - - + +
+ +
+ +
+ 取 消 +
+
+ - - 取 消 - - - +
+