From 60930ba1c8016ca8a725312c5792413b7420e49c Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 16 May 2024 09:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E5=8F=8B=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9B=B4=E6=8E=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/dal/dataobject/material/MaterialDO.java | 5 ++++- .../yunxi/mes/module/biz/manager/ChanjetManager.java | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java index 7edb42c1..f5007346 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java @@ -136,7 +136,10 @@ public class MaterialDO extends TenantBaseDO { * 物料logo地址 */ private String logo; - + /** + * 是否删除 + */ + private Boolean deleted; /** * 存货属性 0b0000000 * 第1位 外购 diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java index 20617158..51460131 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java @@ -602,14 +602,13 @@ public class ChanjetManager { }while (maxTs != null); - // 禁用 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper(){{ - set(MaterialDO::getStatus, ValidStatusEnum.INVALID.getCode()); + // 删除 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(){{ }}; if(!materialIds.isEmpty()){ - updateWrapper.notIn(MaterialDO::getId, materialIds); + wrapper.notIn(MaterialDO::getId, materialIds); } - materialMapper.update(updateWrapper); + materialMapper.delete(wrapper); } /**