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

Merge remote-tracking branch 'origin/master'

master
yxt_djz 3 years ago
parent
0fe5e53f96 68a9cf7148
commit
ede28fdb33
10 changed files with 105 additions and 17 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. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/BaseAccAdjApplyCompleteDto.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  4. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  5. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  6. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
  7. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
  8. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  9. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java
  10. 44
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/BaseAccAdjApplyCompleteDto.java
View File

@ -1,10 +1,12 @@
package com.yxt.anrui.base.api.baseaccadjapply.flow;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
/**
@ -38,4 +40,6 @@ public class BaseAccAdjApplyCompleteDto implements Dto {
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java
View File

@ -1,10 +1,12 @@
package com.yxt.anrui.base.api.busvehicleapply.flow;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* @Author dimengzhe
@ -16,10 +18,11 @@ public class GetNodeQuery implements Query {
private static final long serialVersionUID = -5674867230708197611L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
/* @ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;*/

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
View File

@ -111,7 +111,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.complete(bv);
return baseAccadjApplyService.complete(bv,query.getBaseInternalPurchaseVehicles());
}
@Override

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -317,7 +317,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bv.setTaskDefKey(baseAccadjApply.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
return complete(bv,baseInternalPurchaseVehicles);
}
return rb;
}
@ -360,12 +361,26 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return baseMapper.updateFlowFiled(map);
}
public ResultBean complete(BusinessVariables bv) {
public ResultBean complete(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
String callInOrgSid = baseAccadjApply.getCallInOrgSid();
String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles.size() > 0){
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)){
i = true;
break;
}
}
}
bv.getFormVariables().put("isAdj",i);
if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -562,6 +577,21 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles();
Boolean i = false;
if (baseInternalPurchaseVehicles.size() > 0){
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)){
i = true;
break;
}
}
}
bv.getFormVariables().put("isAdj",i);
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -29,7 +29,7 @@ public enum ProcDefEnum {
FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:400012"),
BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:567508"),
BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
View File

@ -123,12 +123,16 @@ public class ScmApplyInbound extends BaseEntity {
private String num;
@ApiModelProperty("扣减运费")
private String deductionFreight;
@ApiModelProperty("计算政策2:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策3:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策4:扣减政策1")
private String deductionPolicyThreeOne;
@ApiModelProperty("计算政策3:扣减政策2")
@ApiModelProperty("计算政策4:扣减政策2")
private String deductionPolicyThreeTwo;
@ApiModelProperty("计算政策3:扣减政策2")
private String deductionPolicyThreeTwoo;
@ApiModelProperty("计算政策4:扣减政策3")
private String deductionPolicyFourThree;
@ApiModelProperty(value = "采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty(value = "采购类型value")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
View File

@ -137,12 +137,16 @@ public class ScmApplyInboundDto implements Dto {
private String useOrgName;
@ApiModelProperty("扣减运费")
private String deductionFreight;
@ApiModelProperty("计算政策2:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策3:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策4:扣减政策1")
private String deductionPolicyThreeOne;
@ApiModelProperty("计算政策3:扣减政策2")
@ApiModelProperty("计算政策4:扣减政策2")
private String deductionPolicyThreeTwo;
@ApiModelProperty("计算政策3:扣减政策2")
private String deductionPolicyThreeTwoo;
@ApiModelProperty("计算政策4:扣减政策3")
private String deductionPolicyFourThree;
@ApiModelProperty(value = "采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty(value = "采购类型value")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
View File

@ -133,12 +133,16 @@ public class ScmApplyInboundVo implements Vo {
private Date priceDate;
@ApiModelProperty("扣减运费")
private String deductionFreight;
@ApiModelProperty("计算政策2:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策3:扣减政策1")
private String deductionPolicyTwoOne;
@ApiModelProperty("计算政策4:扣减政策1")
private String deductionPolicyThreeOne;
@ApiModelProperty("计算政策3:扣减政策2")
@ApiModelProperty("计算政策4:扣减政策2")
private String deductionPolicyThreeTwo;
@ApiModelProperty("计算政策3:扣减政策2")
private String deductionPolicyThreeTwoo;
@ApiModelProperty("计算政策4:扣减政策3")
private String deductionPolicyFourThree;
@ApiModelProperty(value = "采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty(value = "采购类型value")

1
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/SubmitScmApplyInboundDto.java
View File

@ -40,5 +40,4 @@ public class SubmitScmApplyInboundDto extends ScmApplyInboundDto {
private String orgSidPath;
@ApiModelProperty("员工sid")
private String staffSid;
}

44
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -179,10 +179,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ScmApplyInbound inboundVehicle = new ScmApplyInbound();
BeanUtil.copyProperties(dto, inboundVehicle);
inboundVehicle.setSid(UUID.randomUUID().toString());
String userSid = dto.getUserSid();
/*String userSid = dto.getUserSid();
ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
String createOrgSid = pathSidByUserSid.getData();
inboundVehicle.setUseOrgSid(createOrgSid);
inboundVehicle.setUseOrgSid(createOrgSid);*/
save(inboundVehicle);
// 保存车辆列表
//scmApplyInboundVehicleService.saveApplyInboundVehicleList(vehicleList, inboundVehicle.getSid(), inboundVehicle.getModelSid());
@ -356,10 +356,27 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
String busSid = dto.getSid();
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
if (StringUtils.isBlank(busSid)) {
Map<String, Object> variables = BeanUtil.beanToMap(dto);
ResultBean resultBean = saveOrUpdateApplyInBound(dto);//insert
String businessSid = resultBean.getData().toString();
ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
String vinNo = scmApplyInboundVehicleDto.getVinNo();
if (StringUtils.isBlank(vinNo)){
scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
BeanUtil.copyProperties(scmApplyInbound,scmApplyInboundDto);
scmApplyInboundDto.setSid(null);
scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
}
}
if (scmApplyInboundVehicleDtos1.size() > 0){
scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
saveOrUpdateApplyInBound(scmApplyInboundDto);
}
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setOrgSidPath(orgSidPath);
@ -378,6 +395,27 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
private synchronized ResultBean submitBusinessData(SubmitScmApplyInboundDto dto, String businessSid, String orgSidPath) {
Map<String, Object> variables = BeanUtil.beanToMap(dto);
ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos2 = new ArrayList<>();
ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
String vinNo = scmApplyInboundVehicleDto.getVinNo();
if (StringUtils.isBlank(vinNo)){
scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
BeanUtil.copyProperties(scmApplyInbound,scmApplyInboundDto);
scmApplyInboundDto.setSid(null);
scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
}else {
scmApplyInboundVehicleDtos2.add(scmApplyInboundVehicleDto);
}
}
if (scmApplyInboundVehicleDtos1.size() > 0){
scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
saveOrUpdateApplyInBound(scmApplyInboundDto);
}
ScmApplyInbound entity = this.fetchBySid(dto.getSid());
String businessTaskid = entity.getTaskId();
BusinessVariables bv = new BusinessVariables();
@ -390,12 +428,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId());
bv.setInstanceId(entity.getProcInsId());
if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
dto.setVehicleList(scmApplyInboundVehicleDtos2);
saveOrUpdateApplyInBound(dto);
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
return resultBean1;
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
dto.setVehicleList(scmApplyInboundVehicleDtos2);
saveOrUpdateApplyInBound(dto);
bv.setTaskDefKey(entity.getTaskDefKey());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");

Write Preview
Loading…
Cancel
Save