yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 weeks ago
parent
1f1f5cee02 9b2880079e
commit
3417ad5c31
5 changed files with 173 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java
  2. 20
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java
  3. 42
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
  4. 40
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java
  5. 53
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryallocatebill/AppInventoryAllocatebillFeign.java
View File

@ -22,37 +22,37 @@ public interface AppInventoryAllocatebillFeign {
/**********************************************流程********************************************/
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@PutMapping("/agreeCreditInfo/{type}")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto, @PathVariable("type") String type);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@PutMapping("/rejectCreditInfo/{type}")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@PutMapping("/recallCreditInfo/{type}")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@PutMapping("/stopCreditInfo/{type}")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query, @PathVariable("type") String type);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@GetMapping("/getFlowOperateTitle/{type}")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query, @PathVariable("type") String type);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@PutMapping(value = "/delegate/{type}")
@ResponseBody
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@PutMapping(value = "/assignTask/{type}")
@ResponseBody
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery, @PathVariable("type") String type);
}

20
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillRest.java
View File

@ -49,37 +49,37 @@ public class AppInventoryAllocatebillRest implements AppInventoryAllocatebillFei
}
@Override
public ResultBean agreeCreditInfo(AppFlowDto dto) {
return appInventoryAllocatebillService.agreeCreditInfo(dto);
public ResultBean agreeCreditInfo(AppFlowDto dto, String type) {
return appInventoryAllocatebillService.agreeCreditInfo(dto, type);
}
@Override
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
return appInventoryAllocatebillService.rejectCreditInfo(query);
public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.rejectCreditInfo(query, type);
}
@Override
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
public ResultBean recallCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
public ResultBean stopCreditInfo(AppFlowTaskQuery query, String type) {
return appInventoryAllocatebillService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
return appInventoryAllocatebillService.getFlowOperateTitle(query);
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query, String type) {
return appInventoryAllocatebillService.getFlowOperateTitle(query, type);
}
@Override
public ResultBean delegate(AppDelegateQuery delegateQuery) {
public ResultBean delegate(AppDelegateQuery delegateQuery, String type) {
return appInventoryAllocatebillService.delegate(delegateQuery);
}
@Override
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
public ResultBean assignTask(AppDelegateQuery delegateQuery, String type) {
return appInventoryAllocatebillService.assignTask(delegateQuery);
}
}

42
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
View File

@ -75,7 +75,7 @@ public class AppInventoryAllocatebillService {
return rb.success().setData(appInventoryAllocateBillDetailsVoNew);
}
public ResultBean agreeCreditInfo(AppFlowDto dto) {
public ResultBean agreeCreditInfo(AppFlowDto dto, String type) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
@ -92,18 +92,32 @@ public class AppInventoryAllocatebillService {
CompleteFlowDto completeFlowDto = new CompleteFlowDto();
BeanUtil.copyProperties(dto, completeFlowDto);
completeFlowDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto);
ResultBean resultBean = new ResultBean();
if ("1".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete(completeFlowDto);
} else if ("2".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete2(completeFlowDto);
} else if ("3".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.complete3(completeFlowDto);
}
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
public ResultBean rejectCreditInfo(AppFlowTaskQuery query, String type) {
ResultBean rb = ResultBean.fireFail();
FlowTaskQuery flowTaskQuery = new FlowTaskQuery();
BeanUtil.copyProperties(query, flowTaskQuery);
ResultBean resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery);
ResultBean resultBean = new ResultBean();
if ("1".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject(flowTaskQuery);
} else if ("2".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject2(flowTaskQuery);
} else if ("3".equals(type)) {
resultBean = wmsInventoryAllocatebillFeign.taskReject3(flowTaskQuery);
}
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -132,7 +146,7 @@ public class AppInventoryAllocatebillService {
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query, String type) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
@ -140,7 +154,14 @@ public class AppInventoryAllocatebillService {
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery);
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject = new ResultBean<>();
if ("1".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject(getNodeQuery);
} else if ("2".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject2(getNodeQuery);
} else if ("3".equals(type)) {
getPreviousNodesForReject = wmsInventoryAllocatebillFeign.getPreviousNodesForReject3(getNodeQuery);
}
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
@ -148,7 +169,14 @@ public class AppInventoryAllocatebillService {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit = new ResultBean<>();
if ("1".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("2".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("3".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
}
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();

40
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryallocatebill/WmsInventoryAllocatebillFeign.java
View File

@ -22,6 +22,8 @@ public interface WmsInventoryAllocatebillFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryAllocateBillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid);
/*********************************************************调拨申请(分公司内)流程************************************************************/
@ApiOperation(value = "办理（同意）")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteFlowDto query);
@ -38,6 +40,44 @@ public interface WmsInventoryAllocatebillFeign {
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************调拨申请(集团内)流程************************************************************/
@ApiOperation(value = "办理（同意）")
@PostMapping("/complete2")
public ResultBean complete2(@Valid @RequestBody CompleteFlowDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject2")
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject2(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit2")
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit2(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject2")
public ResultBean taskReject2(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************调拨申请(一级站内)流程************************************************************/
@ApiOperation(value = "办理（同意）")
@PostMapping("/complete3")
public ResultBean complete3(@Valid @RequestBody CompleteFlowDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject3")
ResultBean<List<FlowNodeVo>> getPreviousNodesForReject3(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit3")
ResultBean<List<FlowNodeVo>> getNextNodesForSubmit3(@Valid @SpringQueryMap FlowNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject3")
public ResultBean taskReject3(@Valid @RequestBody FlowTaskQuery query);
/*********************************************************共用************************************************************/
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody FlowTaskQuery query);

53
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
View File

@ -239,6 +239,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -260,7 +261,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员，请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
@ -361,43 +362,33 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
if (sysOrganization != null) {
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
//特殊处理
//获取调出方组织信息
SysOrganizationVo dcOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getOutPlatSid()).getData();
//获取调入方组织信息
SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
//流程预演
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
//获取下一环节审批角色
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
if (bv.getTaskDefKey().equals("Activity_09chr0i")) {//调入方配件主管审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_1jchfap")) {//调出方站长审批
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid());
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
bv.setOrgSidPath(dcOrg.getOrgSidPath());
} else if (bv.getTaskDefKey().equals("Activity_0kn4sub")) {//调入方站长审批
ResultBean<List<Map<String, Object>>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid());
bv.setOrgSidPath(drOrg.getOrgSidPath());
}
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
@ -407,12 +398,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids("");
return rb.setMsg("下一环节暂无审批人员，请联系管理员");
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
}
if (bv.getTaskId().equals(wmsInventoryAllocateBill.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -503,6 +493,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "1");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -645,6 +636,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "2");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -802,6 +794,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
variables.put("isrdy", f1);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "2");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
@ -978,6 +971,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "2");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -1069,6 +1063,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "3");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();
@ -1182,6 +1177,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
variables.put("iscc", f0);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "3");
variables.put("app", appMap);
bv.setFormVariables(variables);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
@ -1317,6 +1313,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("type", "3");
variables.put("app", appMap);
//判断发起人是否为配件主管
String createBySid = wmsInventoryAllocateBill.getCreateBySid();

Write Preview
Loading…
Cancel
Save