From c7c9b3d156758af27c4cde5c50d587a2565dc3d1 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 19 Aug 2021 13:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/controller/PrinterController.java          | 1 +
 dispatch/src/main/resources/mapper/CallItemMapper.xml        | 4 ++--
 .../equip/service/impl/ResourceRepairTaskServiceImpl.java    | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java
index 3c6eebdb..77ad9aa2 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java
@@ -83,6 +83,7 @@ public class PrinterController {
                 return R.ok("保存成功");
             } else {
                 printerModel.setDescription(printer.getDescription());
+                printerModel.setEnabled(printer.getEnabled());
                 printerModel.setModifiedDateTime(nowDate);
                 printerService.updateById(printerModel);
                 return R.ok("修改成功");
diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml
index 31adaeb8..555f72e2 100644
--- a/dispatch/src/main/resources/mapper/CallItemMapper.xml
+++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml
@@ -984,8 +984,8 @@
         ZCI.SHOP_ORDER ,  ZCI.RESRCE,
         IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION,ZCI.COMPONENT_BO ,
         CP.ITEM COMPONENT, ITT.DESCRIPTION COMPONENT_DESCRIPTION, ZSD.BLANKING_SIZE,
-        MIN(ZSD.PLANNED_START_DATE) ,
-        /*MIN(SO.PLANNED_START_DATE) , ZCI.CALL_TYPE,*/
+        /*MIN(ZSD.PLANNED_START_DATE) ,
+        MIN(SO.PLANNED_START_DATE) , ZCI.CALL_TYPE,*/
         SUM(ZCI.REQUIRED_QTY) REQUIRED_QTY
         FROM Z_CALL_ITEM ZCI
         INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.HANDLE = ZCI.SFC_DISPATCH_BO
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index d51e8e29..cf05e5cb 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -145,6 +145,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
 
     @Override
     public ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask) {
+        String user = CommonMethods.getUser();
         // 根据HANDLE查询维修任务
         String handle = resourceRepairTask.getHandle();
         String stopMachine = resourceRepairTask.getStopMachine();
@@ -166,7 +167,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
         if (stopMachine != null && status.equals("501")){
             repairTask.setStatus("501");
             repairTask.setActualStartDate(LocalDateTime.now());
-            repairTask.setRepairUsers(CommonMethods.getUser());
+            repairTask.setRepairUsers(user);
+            NwaUser userByUserName = nwaUserService.findUserByUserName(user);
+            repairTask.setRepairUserName(userByUserName.getFullName());
             resourceRepairTaskService.updateById(repairTask);
             // 修改设备状态---若stopMachie=Y，则状态改为非预定停机
             if (stopMachine.equals("Y")){