控货订单新的审批任务与前端联调业务调整

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -576,7 +576,9 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             orderCargoControlApplyVO.setApplyStatus(1);
             return orderCargoControlApplyVO;
         } else {
-            return JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
+            OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
+            applyVO.setFormId(orderApprovalDO.getFormId());
+            return applyVO;
         }
     }
 
@@ -590,7 +592,9 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             orderCargoControlApplyVO.setApplyStatus(1);
             return orderCargoControlApplyVO;
         } else {
-            return JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
+            OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
+            applyVO.setFormId(orderApprovalDO.getFormId());
+            return applyVO;
         }
     }
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderCargoControl/OrderCargoControlApplyVO.java

@@ -99,4 +99,7 @@ public class OrderCargoControlApplyVO {
     @ApiModelProperty(value = "抄送人(id逗号拼接)")
     private String ccIds;
 
+    @ApiModelProperty(value = "流程表单实例ID")
+    private String formId;
+
 }