From 76cc2cc0b396fadca5158aa668e005215b21be93 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Sat, 26 Oct 2024 15:06:10 +0800
Subject: [PATCH 1/2] 1

---
 .../java/cn/iocoder/yudao/common/RecordTypeEnum.java  | 10 ++++++++++
 .../service/impl/DlTicketWaresServiceImpl.java        | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
index ecf86a4d..7e43c8a0 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
@@ -51,6 +51,16 @@ public enum RecordTypeEnum {
      * 施工中
      */
     SGZ("sgz","施工中"),
+    /**
+     * 通知领料
+     */
+    TZLL("tzll","通知领料"),
+    /**
+     * 通知退料
+     */
+    TZTL("tztl","通知退料"),
+    /**审批配件申请单*/
+    SPPJSQD("sppjsqd","审批配件申请单"),
     /**
      * 接单
      */
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
index 28c99faf..60ce24df 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
@@ -2,12 +2,14 @@ package cn.iocoder.yudao.module.tickets.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.common.RecordTypeEnum;
 import cn.iocoder.yudao.common.RepairRoleEnum;
 import cn.iocoder.yudao.common.SoStatusEnum;
 import cn.iocoder.yudao.common.TicketsItemStatusEnum;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
+import cn.iocoder.yudao.module.base.service.RepairRecordsService;
 import cn.iocoder.yudao.module.base.service.RepairWorkerService;
 import cn.iocoder.yudao.module.project.entity.RepairWares;
 import cn.iocoder.yudao.module.project.service.RepairWaresService;
@@ -94,6 +96,8 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
     @Resource
     @Lazy
     private PermissionApi permissionApi;
+    @Resource
+    private RepairRecordsService repairRecordsService;
 
     /**
      * 分页查询
@@ -345,6 +349,8 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
             DlTicketWares ticketWares = baseMapper.selectById(respVO.getId());
             repairWorkerService.sentMessage(ticketWares.getRepairId(), "您的配件申请单被驳回了");
         }
+        //插入记录
+        repairRecordsService.saveRepairRecord(respVO.getTicketId(),null,RecordTypeEnum.SPPJSQD.getCode(),"审批配件申请单",null);
         // 下面的代码为退料申请单通过的代码，但没有退料申请单，可以注掉，但防止有问题，所以先不删除
 //        } else if (ObjectUtil.isNotEmpty(respVO.getStatus()) && respVO.getStatus().equals("02") && respVO.getType().equals("02")) {
 //            // 如果通过退料，也需要更新
@@ -546,7 +552,10 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
 //            }).collect(Collectors.toList());
 //            twItemService.updateBatchById(newData);
 //        }
-
+        //插入记录
+        //最后记录操作日志--创建工单
+        repairRecordsService.saveRepairRecord(respVO.getTicketId(), null, "02".equals(type)?RecordTypeEnum.TZLL.getCode():RecordTypeEnum.TZTL.getCode(),
+                "02".equals(type)?"通知领料":"通知退料", null);
         // 通知维修工
         // 查维修工的userId
         repairWorkerService.sentMessage(respVO.getRepairId(), type.equals("02") ? "您有新的领料单需要确认" : "您有新的退料单需要确认");

From 99c1df8df929df45baebde8d09d247aa4d232b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Sat, 26 Oct 2024 15:54:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E5=85=A5=E5=BA=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/stockOperate/service/impl/DlRepairSoServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
index 8fbf762d..681c170b 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
@@ -520,7 +520,7 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
         Map<String, DlRepairSoi> filterWareMap = filterWare.stream().collect(Collectors.toMap(DlRepairSoi::getId, soi -> soi));
         pmsWaresList.forEach(item -> {
             DlRepairSoi filterSoi = filterWareMap.get(item.getId());
-            DlRepairSoi inWares = item;
+            DlRepairSoi inWares = BeanUtil.copyProperties(item, DlRepairSoi.class);
             //采购单id
             inWares.setSoId(inSo.getId());
             //采购品原始id