From 5b7d6fe7190f5ee7048035e9a988cfdccd550942 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 2 Nov 2022 18:24:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8E=AF=E8=8A=82=E5=A4=84=E7=90=86=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 6cfb0ae158..a624d92027 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -217,8 +217,7 @@ public class FlowableRest implements FlowableFeign { String nextUserSid = dto.getNextNodeUserSids(); if(StringUtils.isBlank(nextUserSid)){ ResultBean nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); - if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null - || StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) { + if (!nextNodeUserSidsOfSubmit.getSuccess()) { return rb.setMsg("nextUserSid 不能为空!"); } nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid(); @@ -265,10 +264,10 @@ public class FlowableRest implements FlowableFeign { log.error("formVariables:{}",JSON.toJSONString(formVariables)); taskService.setAssignee(taskId, userSid); //formVariables.remove("userSid"); - for(Map.Entry entry:formVariables.entrySet()){ + /*for(Map.Entry entry:formVariables.entrySet()){ taskService.setVariable(taskId,entry.getKey(),entry.getValue()); System.out.println(entry.getKey()+"--->"+entry.getValue()); - } + }*/ taskService.complete(taskId, formVariables); //根据流程实例的id取最新的待办环节,给环节设置上用户sid ResultBean> ll = flowtaskService.getLatestTasksNew(instanceId); @@ -284,6 +283,7 @@ public class FlowableRest implements FlowableFeign { System.out.println(entry.getKey()+"--->"+entry.getValue()); }*/ // taskService.setVariables(id_,formVariables); + //在act_ru_variable表中增加环节上的业务参数的变量 taskService.setVariablesLocal(id_,formVariables); nodeState = latestTaskVo.getName_(); taskDefKey = latestTaskVo.getTask_def_key_(); @@ -391,6 +391,7 @@ public class FlowableRest implements FlowableFeign { if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } + String orgPath = resultBean.getData().get(0).getOrgPath(); String nodeState = resultBean.getData().get(0).getName_(); String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); @@ -402,6 +403,10 @@ public class FlowableRest implements FlowableFeign { /* if (incomingSourceRef.contains("start")) { vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode()); }*/ + Map formVariables=new HashMap<>(); + formVariables.put("orgPath",orgPath); + //在act_ru_variable表中增加环节上的业务参数的变量 + taskService.setVariablesLocal(taskId,formVariables); ResultBean resultBean1 = ResultBean.fireSuccess(); return resultBean1.success().setData(vo); } From 81930b81b3168cb7e9487ab44c4c096f46fb66cd Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 2 Nov 2022 19:22:41 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8E=AF=E8=8A=82=E5=A4=84=E7=90=86=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index e04b065050..b1bb5ea238 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -143,11 +143,11 @@ public class BdMaterialService extends FinKingDeeService { draftFCategoryId(map_fEntityModel_); ResultBean draft = draft(kingDeeData); String data = draft.getData(); - ResultBean submit = submit(KingDeeBillId.BD_MATERIAL.getID(),data); + String id = draftResultGetId(data); + ResultBean submit = submit(KingDeeBillId.BD_MATERIAL.getID(),id); if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); - ResultBean audit = audit(KingDeeBillId.BD_MATERIAL.getID(),data); + ResultBean audit = audit(KingDeeBillId.BD_MATERIAL.getID(),id); if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); - String id = draftResultGetId(draft.getData()); ResultBean allocate = allocate(KingDeeBillId.BD_MATERIAL.getID(),id, map_fEntityModel_.get("TOrgIds")); if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData()); return draft; From 07451bd0df3df082ce955a7a410bfd091297fa4e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 3 Nov 2022 10:08:32 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicleout/BaseVehicleOutDto.java | 3 + .../basevehicleout/BaseVehicleOutFeign.java | 5 + .../BaseVehicleModelMapper.java | 2 +- .../BaseVehicleModelMapper.xml | 2 +- .../BaseVehicleModelService.java | 8 +- .../basevehicleout/BaseVehicleOutMapper.xml | 1 + .../basevehicleout/BaseVehicleOutRest.java | 5 + .../basevehicleout/BaseVehicleOutService.java | 123 +++++++++++++++++- .../CrmCustomerTempService.java | 8 +- .../FinPaymentrecordService.java | 9 +- .../ScmApplyInboundService.java | 21 ++- .../ScmVehInventorymonthService.java | 5 +- 12 files changed, 171 insertions(+), 21 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index c5e6371f97..998ee8a8a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -69,4 +69,7 @@ public class BaseVehicleOutDto implements Dto { private String middleCodeTwo; @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + + @ApiModelProperty("是否要修改客户") + private String isUpdateOrInsertCrm; // 是否要修改客户 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index 33477c7346..15daec5a0c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -27,6 +27,11 @@ public interface BaseVehicleOutFeign { @ResponseBody public ResultBean vehicleOut(@RequestBody BaseVehicleOutDto dto); + @ApiOperation("是否修改客户编码并车辆出库") + @PostMapping("/isUpdateOrInsertCrm") + @ResponseBody + public ResultBean isUpdateOrInsertCrm(@RequestBody BaseVehicleOutDto dto); + @ApiOperation("车辆出库分页列表") @PostMapping("/pagerList") @ResponseBody diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java index 8633e90f97..3027cb3da3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java @@ -38,7 +38,7 @@ public interface BaseVehicleModelMapper extends BaseMapper { * @param qw * @return */ - IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw,@Param("createOrgSid") String createOrgSid); /** * 详情以及修改回显接口 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index b2cf145951..16830d5d7d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml @@ -25,7 +25,7 @@ FROM base_vehmodel_config bvc WHERE bvm.`sid` = bvc.`modelSid` - AND bvm.`createOrg` = bvc.useOrgSid) AS relationConfigNum + AND bvm.`createOrg` = bvc.useOrgSid AND bvm.createOrg = #{createOrgSid}) AS relationConfigNum FROM base_vehicle_model bvm LEFT JOIN base_vehicle_brand bvb diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index b82a1c5d65..4b437783c6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -71,7 +71,7 @@ public class BaseVehicleModelService extends MybatisBaseService pagerList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = buildQueryWrapper(pagerQuery.getParams()); - return baseMapper.pagerList(page, qw); + return baseMapper.pagerList(page, qw, pagerQuery.getParams().getCreateOrgSId()); } /** @@ -602,7 +602,7 @@ public class BaseVehicleModelService extends MybatisBaseService qw = buildQueryWrapper(params); - IPage baseVehicleModelVoIPage = baseMapper.pagerList(page, qw); + IPage baseVehicleModelVoIPage = baseMapper.pagerList(page, qw, params.getCreateOrgSId()); List records = baseVehicleModelVoIPage.getRecords(); for (BaseVehicleModelVo record : records) { record.setConfigSid(params.getConfigSid()); @@ -631,7 +631,7 @@ public class BaseVehicleModelService extends MybatisBaseService ${ew.sqlSegment} + ORDER BY bvo.saleDate DESC SELECT count(1) FROM scm_apply_inbound_vehicle WHERE vinNo=#{vinNo} - - AND applySid != #{applySid} - @@ -230,15 +231,15 @@