界面修改

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("修改成功");

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(ZSD.PLANNED_START_DATE) ,
-        /*MIN(SO.PLANNED_START_DATE) , ZCI.CALL_TYPE,*/
+        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

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")){