添加材料排序

fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

@@ -123,7 +123,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                         if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
                             log.info("设备更新，size:{}", updateDeviceLsit.size());
-                            deviceService.update(updateDeviceLsit);
+                            //deviceService.update(updateDeviceLsit);
                         }
 
                         if (!ObjectUtils.isEmpty(saveDeviceList)) {
@@ -133,7 +133,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                         if (!ObjectUtils.isEmpty(delDeviceList)) {
                             log.info("设备删除，size:{}", delDeviceList.size());
-                            deviceService.remove(delDeviceList,null);
+                            //deviceService.remove(delDeviceList,null);
                         }
                     }
                 } else {
@@ -155,15 +155,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
         Rest<RespData<List<SkinBasePdu>>> skinBaseRest = skinBaseFeign.list(skinBasePdu);
         if (skinBaseRest.getCode() == YesNoEnum.YES.getValue()) {
             List<SkinBasePdu>  skinBasePduList = skinBaseRest.getData().getData();
-            log.info("样表机皮肤总数量：{}", skinBasePduList.size());
+            log.info("填单机皮肤总数量：{}", skinBasePduList.size());
             if (!ObjectUtils.isEmpty(skinBasePduList)) {
                 List<SkinEntity> newSkinList = skinBasePduList.stream().map(newSkin -> {
                     SkinEntity skinEntity = new SkinEntity();
                     skinEntity.initAttrValue();
-
                     newSkin.setCssFilePath("/"+StrUtil.subAfter(newSkin.getCssFilePath(), "/", true));
                     newSkin.setPreviewImagePath("/"+StrUtil.subAfter(newSkin.getPreviewImagePath(), "/", true));
-
                     BeanUtils.copyProperties(newSkin, skinEntity, BeanUtil.getNullPropertyNames(newSkin));
                     return skinEntity;
                 }).collect(Collectors.toList());
@@ -213,7 +211,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                 if (!ObjectUtils.isEmpty(delSkinList)) {
                     log.info("皮肤删除，size:{}", delSkinList.size());
-                    skinService.remove(delSkinList,null);
+                    //skinService.remove(delSkinList,null);
                 }
 
             }

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumPrintServiceImpl.java

@@ -54,7 +54,7 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
             MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
             if (!ObjectUtils.isEmpty(matterDatumEntity)) {
                 entity.setMatterId(matterDatumEntity.getMatterId());
-                entity.setMatterName(matterDatumEntity.getMatterName());
+                entity.setMaterialName(matterDatumEntity.getMaterialName());
             }
         }
         entity.setOrderId(IdUtil.simpleUUID());
@@ -62,7 +62,7 @@ public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterD
         Integer pageByDoc = WordUtil.getPageByDoc(rootPath + entity.getDocPath());
         entity.setPrintPage(pageByDoc);
 
-        if (ObjectUtils.isEmpty(entity.getDeviceCode())) {
+        if (!ObjectUtils.isEmpty(entity.getDeviceCode())) {
             DeviceEntity deviceEntity = deviceService.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode()));
             entity.setDeviceName(deviceEntity == null ? "" : deviceEntity.getDeviceName());
         }