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

问题修改

master
God 2 years ago
parent
b05d752d54
commit
8bee7f783f
7 changed files with 39 additions and 3 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. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  2. 19
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  5. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  6. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  7. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
View File

@ -156,6 +156,8 @@ public class BaseVehicleDto implements Dto {
private String inBoundSid;
@ApiModelProperty(value = "外采sid")
private String outSourcSid;
@ApiModelProperty(value = "审批人、日期")
private String name;
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid

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

@ -447,6 +447,22 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
public ResultBean complete(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
String confirmSid = "";
String confirmName = "";
String confirmDate = "";
if (baseAccadjApply.getAccadjTypeValue().equals("调入")){
if ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey())){
confirmSid = bv.getUserSid();
confirmName = sysUserFeign.fetchBySid(confirmSid).getData().getName();
confirmDate = DateUtil.formatDate(new Date());
}
}else if (baseAccadjApply.getAccadjTypeValue().equals("调出")){
if ("Activity_0gsztjs".equals(bv.getTaskDefKey()) || "Activity_1qtdy4k".equals(bv.getTaskDefKey())){
confirmSid = bv.getUserSid();
confirmName = sysUserFeign.fetchBySid(confirmSid).getData().getName();
confirmDate = DateUtil.formatDate(new Date());
}
}
String callInOrgSid = baseAccadjApply.getCallInOrgSid();
String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
@ -629,6 +645,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName());
scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
scmApplyInboundQueryDto.setConfirmSid(confirmSid);
scmApplyInboundQueryDto.setConfirmName(confirmName);
scmApplyInboundQueryDto.setConfirmDate(confirmDate);
scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCreateOrgSid());
SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
View File

@ -473,6 +473,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
scmApplyInboundQueryDto.setMakeListSid(scmApplyInboundVo.getApplicationSid());
scmApplyInboundQueryDto.setMakeListName(scmApplyInboundVo.getApplicationName());
scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
String name = baseVehicleDto.getName();
String[] names = name.split("-");
scmApplyInboundQueryDto.setConfirmSid(names[0]);
scmApplyInboundQueryDto.setConfirmName(names[1]);
scmApplyInboundQueryDto.setConfirmDate(names[2]);
scmApplyInboundQueryDto.setCreateOrgSid(scmApplyInboundVo.getUseOrgSid());
scmApplyInboundQueryDto.setCreateOrgName(scmApplyInboundVo.getUseOrgName());
scmApplyInboundQueryDto.setDownNum("0");

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
View File

@ -129,7 +129,7 @@
SELECT
so.name AS createOrgName,
bvo.vinNo,
bv.configName AS modelConfig,
bv.modelName AS modelConfig,
bv.insideCode,
bvo.type,
bvo.saleDate,

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -2025,6 +2025,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney().toString());
dataMap.put("tPriceDX", tPriceDX);
dataMap.put("makeName", finCollectionConfirmationDetailsVo.getCreateByName() + DateUtil.formatDate(new Date()));
dataMap.put("confirmName", finCollectionConfirmationDetailsVo.getConfirmName() + finCollectionConfirmationDetailsVo.getConfirmDate());
//获取模板
//模板路径
String sourcePath = "D:\\anrui\\upload\\template\\";

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

@ -529,8 +529,15 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
*/
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
String name = "";
String businessSid = bv.getBusinessSid();
ScmApplyInbound booad = this.fetchBySid(businessSid);
String taskDefKey = bv.getTaskDefKey();
if ("Activity_1f72i1m".equals(taskDefKey)){
String userSid = bv.getUserSid();
name = sysUserFeign.fetchBySid(userSid).getData().getName();
name = userSid + "-" + name + "-" + DateUtil.formatDate(new Date());
}
if (bv.getTaskId().equals(booad.getTaskId())) {
bv.setOrgSidPath(booad.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@ -544,7 +551,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ResultBean<List<String>> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(scmApplyInbound.getPriceDate(),
bv.getUserSid(), booad, businessSid, scmApplyInboundVehicleDtos);
saveItem(sids);
newBaseVehicleDto(booad, scmApplyInboundVehicleDtos);
newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name);
//入账审批通关修改采购订单状态 state = 1
if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {
busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
@ -556,7 +563,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
}
}
private void newBaseVehicleDto(ScmApplyInbound booad, List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
private void newBaseVehicleDto(ScmApplyInbound booad, List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos, String name) {
List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
//获取车辆对应的采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路
ResultBean<ActualAndOrgDeptVo> actualAndOrgDept = busVehicleOrderFeign.getActualAndOrgDept(booad.getVehicleOrderSid(), booad.getModelSid(), booad.getConfigSid());
@ -662,6 +669,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(booad.getUseOrgSid()).getData();
baseVehicleDto.setOrgCode(sysOrganizationVo1.getOrgCode());
baseVehicleDto.setInBoundSid(booad.getSid());
baseVehicleDto.setName(name);
baseVehicleDtos.add(baseVehicleDto);
}
ThreadUtil.execute(() -> baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode()));

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
View File

@ -223,6 +223,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
String tPriceDX = TransformMoney.transform(tPrice.toString());
dataMap.put("tPriceDX", tPriceDX);
dataMap.put("makeName", scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate());
dataMap.put("confirmName", scmApplyInboundQuery.getConfirmName() + scmApplyInboundQuery.getConfirmDate());
//获取模板
//模板路径
String sourcePath = "D:\\anrui\\upload\\template\\";

Write Preview
Loading…
Cancel
Save