分开手动上联

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/ExternalUnitEquipController.java

@@ -127,7 +127,7 @@ public class ExternalUnitEquipController {
 
             case  "省政府办公厅":
 
-            case  "省用通信局":
+            case  "省专用通信局":
 
             case  "宁波市专用通信局":
 

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/SelfCheckBillServiceImpl.java

@@ -569,9 +569,11 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
 
         if (selfExaminationBillEntity.getUnStockDetail()!=null){
             //5 非在库
-            newDeviceList.addAll(Objects.requireNonNull(JacksonUtil.readValue(selfExaminationBillEntity.getUnStockDetail(), new TypeReference<List<DeviceLibrary>>() {
-            })));
-
+            List<DeviceLibrary> deviceLibraries = JacksonUtil.readValue(selfExaminationBillEntity.getUnStockDetail(), new TypeReference<List<DeviceLibrary>>() {
+            });
+            if (deviceLibraries!=null) {
+                newDeviceList.addAll(deviceLibraries);
+            }
         }
 
         selfExaminationBillEntity.setDeviceLibraries(newDeviceList);

dev-union/src/main/java/com/tykj/dev/union/RunController.java

@@ -30,6 +30,7 @@ import com.tykj.dev.device.selfcheck.service.SelfCheckBillService;
 import com.tykj.dev.device.sendback.service.DeviceRepelDetailService;
 import com.tykj.dev.device.storage.service.StorageBillService;
 import com.tykj.dev.device.train.controller.TrainJobController;
+import com.tykj.dev.device.train.service.WorkHandoverService;
 import com.tykj.dev.device.user.cache.UnitsCache;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.entity.Area;
@@ -118,7 +119,10 @@ public class RunController {
     private StorageBillService storageBillService;
 
     @Autowired
-    TrainJobController trainJobController;
+    private TrainJobController trainJobController;
+
+    @Resource
+    private WorkHandoverService workHandoverService;
 
 
     @ApiOperation(value = "修正核查的历史装备数据")
@@ -324,4 +328,12 @@ public class RunController {
         trainJobController.historyUpperChain();
     }
 
+    @ApiOperation(value = "业务历史循环上链（交接）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock14")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock14() {
+
+        workHandoverService.historyUpperChain();
+    }
+
 }

dev-union/src/main/resources/application-dev.properties

@@ -27,6 +27,6 @@ block.carrier.ip=http://192.168.0.147:8088
 carrier.url = http://192.168.0.101:8087/configuration/saveConfiguration
 
 file.matching.excel=/Users/zhoushaopan/excel/
-check.time.last=C:/file/CHECKTIME2.txt
+check.time.last=C:/file/2.txt
 
 ven.http=