diff --git a/src/main/java/com/xujie/modules/workFlow/controller/ErfFlowInstanceController.java b/src/main/java/com/xujie/modules/workFlow/controller/ErfFlowInstanceController.java index 7e5d0b0..76a7ae9 100644 --- a/src/main/java/com/xujie/modules/workFlow/controller/ErfFlowInstanceController.java +++ b/src/main/java/com/xujie/modules/workFlow/controller/ErfFlowInstanceController.java @@ -44,12 +44,12 @@ public class ErfFlowInstanceController extends AbstractController { } /** - * 创建流程实例(测试用) + * 创建流程实例(测试用) - rqrq */ @PostMapping("/create") @ResponseBody public R createFlowInstance(@RequestBody ErfFlowInstanceData data) { - erfFlowInstanceService.createFlowInstance(data.getApplyNo(), data.getOrderType(), + erfFlowInstanceService.createFlowInstance(data.getOrderRef1(), data.getOrderType(), data.getSite(), data.getFlowCode()); return R.ok(); } diff --git a/src/main/java/com/xujie/modules/workFlow/entity/ErfFlowInstance.java b/src/main/java/com/xujie/modules/workFlow/entity/ErfFlowInstance.java index 21c8d4c..35cb9a8 100644 --- a/src/main/java/com/xujie/modules/workFlow/entity/ErfFlowInstance.java +++ b/src/main/java/com/xujie/modules/workFlow/entity/ErfFlowInstance.java @@ -67,6 +67,11 @@ public class ErfFlowInstance extends QueryPage { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; + /** + * 关联单号 - rqrq + */ + private String orderRef1; + /** * 备注 */ diff --git a/src/main/java/com/xujie/modules/workFlow/service/ErfFlowInstanceService.java b/src/main/java/com/xujie/modules/workFlow/service/ErfFlowInstanceService.java index b73d816..20ffe1f 100644 --- a/src/main/java/com/xujie/modules/workFlow/service/ErfFlowInstanceService.java +++ b/src/main/java/com/xujie/modules/workFlow/service/ErfFlowInstanceService.java @@ -23,9 +23,9 @@ public interface ErfFlowInstanceService { List searchNodeInstanceList(String applyNo, String site, String orderType); /** - * 创建流程实例 + * 创建流程实例 - rqrq 返回审批单号 */ - void createFlowInstance(String applyNo, String orderType, String site, String flowCode); + String createFlowInstance(String orderRef1, String orderType, String site, String flowCode); /** * 审批节点实例 diff --git a/src/main/java/com/xujie/modules/workFlow/service/impl/ErfFlowInstanceServiceImpl.java b/src/main/java/com/xujie/modules/workFlow/service/impl/ErfFlowInstanceServiceImpl.java index 1f7e504..27b22ad 100644 --- a/src/main/java/com/xujie/modules/workFlow/service/impl/ErfFlowInstanceServiceImpl.java +++ b/src/main/java/com/xujie/modules/workFlow/service/impl/ErfFlowInstanceServiceImpl.java @@ -8,6 +8,7 @@ import com.xujie.modules.sys.entity.SysUserEntity; import com.xujie.modules.workFlow.data.*; import com.xujie.modules.workFlow.entity.ErfFlowInstance; import com.xujie.modules.workFlow.entity.ErfFlowNodeInstance; +import com.xujie.modules.srm.mapper.SrmSupplierMapper; import com.xujie.modules.workFlow.mapper.ErfFlowInstanceMapper; import com.xujie.modules.workFlow.mapper.ErfFlowTemplateMapper; import com.xujie.modules.workFlow.service.ErfFlowInstanceService; @@ -30,6 +31,9 @@ public class ErfFlowInstanceServiceImpl extends ServiceImpl - + - + INSERT INTO erf_flow_instance ( - apply_no, site, order_type, flow_code, flow_version, + apply_no, order_ref1, site, order_type, flow_code, flow_version, status, current_node_code, start_time ) VALUES ( - #{applyNo}, #{site}, #{orderType}, #{flowCode}, #{flowVersion}, + #{applyNo}, #{orderRef1}, #{site}, #{orderType}, #{flowCode}, #{flowVersion}, #{status}, #{currentNodeCode}, GETDATE() ) @@ -154,10 +158,11 @@ AND ni.order_type = #{orderType} - +