From 4b16549f6dc870df8264d9db53e99fb3ba7614fb Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Mon, 22 Jul 2024 13:41:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energy/modules/leger/mapper/DynamicledgerMapper.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml b/src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml index e2cb2dc..9519799 100644 --- a/src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml @@ -71,6 +71,7 @@ l_equipment_ledger aa left join smt_work_permit c on aa.kks_encoding = c.kks_encoding + and c.check_status = '2' and c.is_deleted = '0' and aa.station = #{entity.station} @@ -98,6 +99,7 @@ left join smt_operation_ticket d on aa.kks_encoding = d.kks_encoding and d.is_deleted = '0' + and d.review_status = '2' and aa.station = #{entity.station} @@ -166,6 +168,7 @@ a.id = b.equipment_ledger_id and a.is_deleted = '0' and b.is_deleted = '0' + and a.kks_encoding = #{entity.kksEncoding} @@ -206,7 +209,7 @@ @@ -248,7 +251,7 @@ From 35c6a42413dcfb5e43545df5506f51865eedd5d5 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 22 Jul 2024 14:01:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spares/controller/MaterialController.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialController.java b/src/main/java/org/energy/modules/spares/controller/MaterialController.java index 65e4a27..30dc063 100644 --- a/src/main/java/org/energy/modules/spares/controller/MaterialController.java +++ b/src/main/java/org/energy/modules/spares/controller/MaterialController.java @@ -37,7 +37,12 @@ import lombok.SneakyThrows; import org.apache.commons.codec.Charsets; import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.spares.entity.Inbound; +import org.energy.modules.spares.entity.Outbound; import org.energy.modules.spares.excel.MaterialExcel; +import org.energy.modules.spares.service.IInboundService; +import org.energy.modules.spares.service.IOutboundService; import org.energy.modules.system.util.DataUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; @@ -65,6 +70,8 @@ import java.util.Map; public class MaterialController extends DafController { private IMaterialService materialService; + private IInboundService inboundService; + private IOutboundService outboundService; /** * 详情 @@ -176,6 +183,22 @@ public class MaterialController extends DafController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + for (String id : ids.split(",")) { + // 获取物资编码 + Material sel = new Material(); + sel.setId(Long.parseLong(id)); + Material material = materialService.getOne(Condition.getQueryWrapper(sel)); + // 通过物资编码删除入库数据 + QueryWrapper qw1 = new QueryWrapper<>(); + qw1.lambda().eq(Inbound::getMaterialNo, material.getMaterialNo()); + qw1.lambda().eq(Inbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + inboundService.remove(qw1); + // 通过物资编码删除出库数据 + QueryWrapper qw2 = new QueryWrapper<>(); + qw2.lambda().eq(Outbound::getMaterialNo, material.getMaterialNo()); + qw2.lambda().eq(Outbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + outboundService.remove(qw2); + } return R.status(materialService.deleteLogic(Func.toLongList(ids))); } From f534f0f168bba85d799ae02b2a13bb557faa6ef3 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Mon, 22 Jul 2024 14:59:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/leger/controller/EquipmentLedgerController.java | 3 +-- .../leger/controller/ToolInventoryRecordController.java | 3 +-- .../org/energy/modules/leger/entity/ToolInventoryRecord.java | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index b892dc5..20b19a3 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -208,8 +208,7 @@ public class EquipmentLedgerController extends DafController { public R approve(Integer status, String ids) { List list = new ArrayList<>(); for (String id : ids.split(",")) { - EquipmentLedger equipmentLedger = new EquipmentLedger(); - equipmentLedger.setId(Long.parseLong(id)); + EquipmentLedger equipmentLedger = equipmentLedgerService.getById(Long.parseLong(id)); equipmentLedger.setCheckStatus(status); list.add(equipmentLedger); } diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index d46f144..899280c 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -198,8 +198,7 @@ public class ToolInventoryRecordController extends DafController { public R approve(Integer status, String ids) { List list = new ArrayList<>(); for (String id : ids.split(",")) { - ToolInventoryRecord toolInventoryRecord = new ToolInventoryRecord(); - toolInventoryRecord.setId(Long.parseLong(id)); + ToolInventoryRecord toolInventoryRecord = toolInventoryRecordService.getById(Long.parseLong(id)); toolInventoryRecord.setCheckStatus(status); list.add(toolInventoryRecord); } diff --git a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java index 7f40435..5650042 100644 --- a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java +++ b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java @@ -1,5 +1,7 @@ package org.energy.modules.leger.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; @@ -51,6 +53,7 @@ public class ToolInventoryRecord extends BaseEntity { * 配置日期 */ @ApiModelProperty(value = "配置日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String configurationDate; /** * 责任班组