diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java index c282c3d020..986b98b1f9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java @@ -22,6 +22,9 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; + @ApiModelProperty(value = "调账申请sid") + private String sid; + @ApiModelProperty("调账车辆列表") private List baseInternalPurchaseVehicles; // 调账车辆列表 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java index e9b6e851a9..dfdf0a21a0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java @@ -72,6 +72,8 @@ public class BaseInternalPurchaseVehicle extends BaseEntity { private String inventoryLocationName; // 库存地点名称 @ApiModelProperty("内销价格") private String witPinMoney; // 内销价格 + @ApiModelProperty("初始内销价格") + private String initialWitPinMoney; // 初始内销价格 @ApiModelProperty("发票类型key") private String invoiceTypeKey; // 发票类型key @ApiModelProperty("发票类型value") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java index 8f25961e9c..c10c4994cd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java @@ -69,6 +69,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo { private String inventoryLocationName; // 库存地点名称 @ApiModelProperty("内销价格") private String witPinMoney; // 内销价格 + @ApiModelProperty("初始内销价格") + private String initialWitPinMoney; // 初始内销价格 @ApiModelProperty("发票类型key") private String invoiceTypeKey; // 发票类型key @ApiModelProperty("发票类型value") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java index 164d7da34c..06d082c1ae 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java @@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto { private String inventoryLocationName; // 库存地点名称 @ApiModelProperty("内销价格") private String witPinMoney; // 内销价格 + @ApiModelProperty("初始内销价格") + private String initialWitPinMoney; // 初始内销价格 @ApiModelProperty("发票类型key") private String invoiceTypeKey; // 发票类型key @ApiModelProperty("发票类型value") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java index 8990eef6da..6248ec8b9e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java @@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo { private String inventoryLocationName; // 库存地点名称 @ApiModelProperty("内销价格") private String witPinMoney; // 内销价格 + @ApiModelProperty("初始内销价格") + private String initialWitPinMoney; // 初始内销价格 @ApiModelProperty("发票类型key") private String invoiceTypeKey; // 发票类型key @ApiModelProperty("发票类型value") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index 457b91f709..9aaf8857f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -25,16 +25,14 @@ *********************************************************/ package com.yxt.anrui.base.api.basevehicletempstate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: comc(comc)
* File: BaseVehicleTempstateFeign.java
@@ -79,5 +77,5 @@ public interface BaseVehicleTempstateFeign { @ApiOperation("根据业务sid删除记录") @DeleteMapping("/delByBusSid") @ResponseBody - public ResultBean delByBusSid(String businessSid); + public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index e0399d6cf8..73d466963b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -379,16 +379,28 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); Map formVariables = bv.getFormVariables(); if (formVariables == null) { map.put("isAdj", i); bv.setFormVariables(map); + }else { + formVariables.put("isAdj", i); } if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); @@ -423,7 +435,7 @@ public class BaseAccadjApplyService extends MybatisBaseService purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); + Boolean i = false; + for (String s : purchaseSids) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney(); + if (!witPinMoney.equals(initialWitPinMoney)) { + i = true; + break; + } + } + Map map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if (formVariables == null) { + map.put("isAdj", i); + bv.setFormVariables(map); + }else { + formVariables.put("isAdj", i); + } ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -668,8 +699,19 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByMainSid(query.getSid()); + for (String s : stringList) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney(); + if (!witPinMoney.equals(initialWitPinMoney)) { + i = true; + break; + } + } } + bv.getFormVariables().put("isAdj", i); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 63503874af..224abbb854 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -239,6 +239,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService getListBySid(String sid); + + @Update("update base_internal_purchase_vehicle set witPinMoney = #{witPinMoney} where sid = #{sid}") + void updateWitPinMoneyBySid(@Param("witPinMoney") String witPinMoney,@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java index 57403d02c3..57bba15982 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java @@ -129,4 +129,8 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService getListBySid(String sid) { return baseMapper.getListBySid(sid); } + + public void updateWitPinMoneyBySid(String witPinMoney,String sid) { + baseMapper.updateWitPinMoneyBySid(witPinMoney,sid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 5eff5e5567..fd376e66d1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -174,20 +174,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode())) baseVehicleService.updateVeh(baseVehicle); //入账生成台账 - if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) + if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){ baseVehicleService.saveVeh_rz(baseVehicle); + kingdeeStkInStock(dto); + } //外采入库生成台账 - if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) + if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ baseVehicleService.saveVeh_wc(baseVehicle); + kingdeeStkInStock(dto); + } //调车入库生成台账 if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode())) baseVehicleService.saveVeh_tc(baseVehicle); } - //入账生成台账 //外采入库生成台账 - if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())|| - eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ - kingdeeStkInStock(dto); - } return rb.success().setMsg("保存成功"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index f8af4a3fc6..f6dca98436 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1917,7 +1917,6 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); -// String msgSid = getMessage(ufVo, appMap, busMainDeposit); return voResultBean; } if (r == 2) { @@ -1942,7 +1941,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", bv.getBusinessSid()); + appMap.put("virtualOrderSid", bv.getBusinessSid()); variables.put("app", appMap); bv.setFormVariables(variables); if (bv.getTaskId().equals(busMainDeposit.getTaskId())) { @@ -2054,7 +2053,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", appMap); + appMap.put("virtualOrderSid", appMap); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -2154,60 +2153,4 @@ public class BusMainDepositService extends MybatisBaseService appMap, BusMainDeposit busMainDeposit) { - //=====极光推送信息========================================参数组装 - String procId = busMainDeposit.getProcInsId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - //根据用户的sid查询用户的id - ResultBean stringList1 = sysUserFeign.selectIdBySid(receiveSidList); - List reveiveIdList = Arrays.asList(stringList1.getData().split(",")); - MessageFlowableDto messageFlowableDto = new MessageFlowableDto(); - MessageJsonDto messageJsonDto = new MessageJsonDto(); - BeanUtil.copyProperties(ufVo, messageJsonDto); - //查询流程审批的页面操作地址组装json的参数 - //根据taskDef和移动端标识 - String proDefId = ""; - String name = ""; - if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取 - proDefId = ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(); - name = "简易订单申请-订金收取"; - } else { - if ("02".equals(busMainDeposit.getDepositBillTypeKey())) {//车辆预定 - proDefId = ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(); - name = "简易订单申请-车辆预定"; - } - } - ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(proDefId, ufVo.getTaskDefKey(), "1", "2"); - SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); - messageFlowableDto.setBusinessSid(busMainDeposit.getSid()); - messageFlowableDto.setApp_type("2"); - if (sysProUrlVo.getUrl().contains("#")) { - messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); - List codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList()); - int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray(); - ; - messageJsonDto.setButtons(ints); - } else { - messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); - } - messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0)); - messageJsonDto.setTaskName(ufVo.getNodeState()); - messageJsonDto.setProcInsId(ufVo.getProcInsId()); - messageJsonDto.setAppMap(appMap); - messageFlowableDto.setJson(messageJsonDto); - messageFlowableDto.setList(receiveSidList); - messageFlowableDto.setReceiveIdList(reveiveIdList); - messageFlowableDto.setModuleName(name); - messageFlowableDto.setMsgContent(name); - messageFlowableDto.setMsgTitle(name); - messageFlowableDto.setCreateName(busMainDeposit.getStaffName()); - messageFlowableDto.setTaskId(ufVo.getTaskId()); - ResultBean stringResultBean = messageFeign.getMessage(messageFlowableDto); - String msgSid = stringResultBean.getData(); - return msgSid; - - }*/ - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java index 2aa3f0c4aa..666da776be 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java @@ -64,6 +64,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper { @Select("select * from scm_special_rebate") List selectListVo(); - @Update("update from scm_special_rebate set state = 1 where sid = #{specialRebateSid}") + @Update("update scm_special_rebate set state = 1 where sid = #{specialRebateSid}") void updateState(String specialRebateSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index 46b57100bf..129b9a55fd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -87,7 +87,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ return scmSpecialRebateWithApplyService.delAll(sids); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index fac3cd4cbb..90913744b8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -850,6 +850,7 @@ public class ScmVehicleGressionService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); @@ -872,7 +873,6 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + + }else{ //推送车辆台账数据 VehicleGression vehicleGression = new VehicleGression(); List list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); @@ -926,6 +928,8 @@ public class ScmVehicleGressionService extends MybatisBaseService { @Select("select * from scm_veh_rebate") List selectListVo(); - @Update("update from scm_veh_rebate set state = 1 where sid = #{sid}") + @Update("update scm_veh_rebate set state = 1 where sid = #{sid}") void updateState(String sid); ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);