fix：任务报工执行优化

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -185,6 +185,9 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
     @Autowired
     private WorkpieceService workpieceService;
 
+    @Autowired
+    private OrderTaskService orderTaskService;
+
     @Override
     public IPage<Order> pageList(IPage page,String sustDesc, LbqWrapper<Order> wrapper) {
         return baseMapper.pageList(page,sustDesc, wrapper, new DataScope());
@@ -1262,6 +1265,9 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         // 删除几点执行任务
         aAutoNodeLogService.remove(Wraps.<AAutoNodeLog>lbQ().eq(AAutoNodeLog::getOrderId,planProduct.getOrderId()));
 
+        // 删除自定义订单
+        orderTaskService.remove(Wraps.<OrderTask>lbQ().eq(OrderTask::getOrderId,planProduct.getOrderId()));
+
         return true;
 
     }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/StationUserServiceImpl.java

@@ -342,7 +342,7 @@ public class StationUserServiceImpl extends SuperServiceImpl<StationUserMapper,
                 s = restTemplate.postForObject(url, formEntity, String.class);
             } else {
                 MoniLogPo moniLogPo = moniLogService.getOne(Wraps.<MoniLogPo>lbQ().eq(MoniLogPo::getRequestPar, url.substring(url.lastIndexOf("/")+1)+"_"+model.get("brandNo").toString()).last("limit 1"));
-                s = moniLogPo==null?"":moniLogPo.getReturnFata();
+                s = moniLogPo!=null?moniLogPo.getReturnFata():"{\"taskId\":\"1915689002237689856\",\"taskNodeID\":\"1915689002237689856\",\"result\":\"true\",\"resultMsg\":\"\",\"concurrency\":\"false\",\"data\":null,\"returnData\":null}\n";
             }
 
             JSONObject retJson = JSONObject.parseObject(s);