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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
9df618a2ff 213bc234c4
commit
8978988a6e
6 changed files with 182 additions and 74 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. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 8
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  3. 1
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  4. 139
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  5. 53
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  6. 41
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -298,6 +298,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
ResultBean rb = ResultBean.fireFail();
//获取调车车辆信息
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), dto.getCreateOrgSid());
if (baseVehicle.getVehicleState().equals("0009")){
return rb.setMsg("选择的车架号为" + baseVehicle.getVinNo() + "的车辆已在审批过程中，请重新选择");
}
}
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
@ -744,7 +750,13 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
String nodeState = map.get("nodeState").toString();
if (nodeState.equals("调车申请")){
List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(),VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(),baseInternalPurchase.getCreateOrgSid());
}
}
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
String businessSid = query.getBusinessSid();

8
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
View File

@ -310,6 +310,14 @@ public class FlowableRest implements FlowableFeign {
String id_ = latestTaskVo.getId_();
taskService.setAssignee(id_, nextUserSid);
vo.setTaskId(id_);
/* for(Map.Entry<String, Object> entry:formVariables.entrySet()){
taskService.setVariable(id_,entry.getKey(),entry.getValue());
taskService.setVariableLocal(id_,entry.getKey(),entry.getValue());
System.out.println(entry.getKey()+"--->"+entry.getValue());
}*/
// taskService.setVariables(id_,formVariables);
taskService.setVariablesLocal(id_,formVariables);
nodeState = latestTaskVo.getName_();
taskDefKey = latestTaskVo.getTask_def_key_();
} else {

1
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -450,6 +450,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.includeProcessVariables()
.includeTaskLocalVariables()
.or()
.taskVariableValueEquals("orgSidPath","111222333")
//.taskCandidateGroupIn(roleSidList)
.taskAssigneeLike("%" + userSid + "%")
.endOr()

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

@ -471,86 +471,19 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ScmApplyInbound scmApplyInbound = scmApplyInboundService.fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
ResultBean<List<String>> resultBean1 = saveEntryCarInspectedInfo(bv, businessSid, booad, scmApplyInbound, scmApplyInboundVehicleDtos);
if (!resultBean1.getSuccess()) {
return rb.setMsg("验车业务模块的数据推送失败!");
}
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
//验车数据推送
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
scmEntryVehicleExamineDto.setBusinessSid(businessSid);
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
scmEntryVehicleExamineDto.setModelName(booad.getModelName());
scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");
scmEntryVehicleExamineDto.setPrice("");
scmEntryVehicleExamineDto.setDepartureDate(booad.getDepartureDate());
scmEntryVehicleExamineDto.setPurchaseTypeKey(booad.getManPurOrderTypeKey());
scmEntryVehicleExamineDto.setPurchaseType(booad.getManPurOrderTypeValue());
//厂家入库日期
scmEntryVehicleExamineDto.setInboundDate(scmApplyInbound.getPriceDate());
ResultBean<String> resultBean1 = scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
if (!resultBean1.getSuccess()) {
return rb.setMsg("验车业务模块的数据推送失败!");
}
ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
scmVehinspectItemDto.setVehInspectSid(resultBean1.getData());
scmVehinspectItemService.saveItem(scmVehinspectItemDto);
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
baseVehicleDto.setModelSid(booad.getModelSid());
baseVehicleDto.setModelName(booad.getModelName());
String userSid = bv.getUserSid();
ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
String data = pathSidByUserSid.getData();
baseVehicleDto.setCreateOrgSid(booad.getUseOrgSid());
baseVehicleDto.setCreateOrgName(booad.getUseOrgName());
baseVehicleDto.setUseOrgSid(booad.getUseOrgSid());
baseVehicleDto.setUseOrgName(booad.getUseOrgName());
baseVehicleDto.setModelConfigSid(booad.getConfigSid());
baseVehicleDto.setConfigName(booad.getConfigName());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
//厂家合同价
baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
if (booad.getOnceFreight() == null && booad.getSecondaryFreight() == null) {//一次为空 二次为空
//运费合计
baseVehicleDto.setFreight(0);
} else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() != null) {//一次不为空 二次不空
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
} else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() == null) {//一次不为空 二次空
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().toString()));
} else if (booad.getOnceFreight() == null && booad.getSecondaryFreight() != null) { //一次为空 二次不空
baseVehicleDto.setFreight(Integer.parseInt(booad.getSecondaryFreight().toString()));
}
// baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
//厂家结算价
baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
baseVehicleDto.setPriceDate(booad.getPriceDate());
baseVehicleDto.setDepartureDate(booad.getDepartureDate());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey());
baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue());
baseVehicleDtos.add(baseVehicleDto);
saveItem(resultBean1);
newBaseVehicleDto(bv, booad, baseVehicleDtos, scmApplyInboundVehicleDto);
}
baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode());
// 入账审批通关修改采购订单状态 state = 1
if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {
busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
}
try {
/*List<BdMaterial> bdMaterials= createBdMaterialList(scmApplyInbound,scmApplyInboundVehicleDtos);
ResultBean r = finKingDeeFeign.draftBdMaterialList(bdMaterials);*/
/* StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);*/
} catch (Exception e) {
//return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -558,6 +491,66 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
}
}
private void newBaseVehicleDto(BusinessVariables bv, ScmApplyInbound booad, List<BaseVehicleDto> baseVehicleDtos, ScmApplyInboundVehicleDto scmApplyInboundVehicleDto) {
//车辆台账推送数据
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
baseVehicleDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
baseVehicleDto.setModelSid(booad.getModelSid());
baseVehicleDto.setModelName(booad.getModelName());
String userSid = bv.getUserSid();
ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid);
String data = pathSidByUserSid.getData();
baseVehicleDto.setCreateOrgSid(booad.getUseOrgSid());
baseVehicleDto.setCreateOrgName(booad.getUseOrgName());
baseVehicleDto.setUseOrgSid(booad.getUseOrgSid());
baseVehicleDto.setUseOrgName(booad.getUseOrgName());
baseVehicleDto.setModelConfigSid(booad.getConfigSid());
baseVehicleDto.setConfigName(booad.getConfigName());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
//厂家合同价
baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
if (booad.getOnceFreight() == null && booad.getSecondaryFreight() == null) {//一次为空 二次为空
//运费合计
baseVehicleDto.setFreight(0);
} else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() != null) {//一次不为空 二次不空
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
} else if (booad.getOnceFreight() != null && booad.getSecondaryFreight() == null) {//一次不为空 二次空
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().toString()));
} else if (booad.getOnceFreight() == null && booad.getSecondaryFreight() != null) { //一次为空 二次不空
baseVehicleDto.setFreight(Integer.parseInt(booad.getSecondaryFreight().toString()));
}
// baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
//厂家结算价
baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
baseVehicleDto.setPriceDate(booad.getPriceDate());
baseVehicleDto.setDepartureDate(booad.getDepartureDate());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setManPurOrderTypeKey(booad.getManPurOrderTypeKey());
baseVehicleDto.setManPurOrderTypeValue(booad.getManPurOrderTypeValue());
baseVehicleDtos.add(baseVehicleDto);
}
private void saveItem( ResultBean<List<String>> resultBean1) {
List<ScmVehinspectItemDto> list=new ArrayList();
List<String> data = resultBean1.getData();
for(String s:data){
//推送验车检查表
ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
scmVehinspectItemDto.setVehInspectSid(s);
list.add(scmVehinspectItemDto);
}
scmVehinspectItemService.saveItem(list);
}
private ResultBean<List<String>> saveEntryCarInspectedInfo(BusinessVariables bv, String businessSid, ScmApplyInbound booad,
ScmApplyInbound scmApplyInbound,
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
ResultBean<List<String>> resultBean1 = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(scmApplyInbound.getPriceDate(),bv.getUserSid(),booad,businessSid,scmApplyInboundVehicleDtos);
return resultBean1;
}
/**
* 创建采购入库单
* @param scmApplyInbound

53
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
View File

@ -44,6 +44,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInbound;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryCarWarehousingDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.*;
@ -389,6 +391,57 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
return rb.success().setData(scmVehicleExamine.getSid());
}
/**
* 入账申请 保存验车单
*
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean<List<String>> saveEntryCarInspectedInfoBatch(String priceDate,String userSid,ScmApplyInbound booad,
String businessSid,
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<ScmVehicleExamine> list=new ArrayList<>();
List<String> sids=new ArrayList<>();
for(ScmApplyInboundVehicleDto scmApplyInboundVehicleDto:scmApplyInboundVehicleDtos){
//验车数据推送
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
scmEntryVehicleExamineDto.setBusinessSid(businessSid);
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
scmEntryVehicleExamineDto.setModelName(booad.getModelName());
scmEntryVehicleExamineDto.setModelSid(booad.getModelSid());
//订单类型
scmEntryVehicleExamineDto.setPurchaseTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
scmEntryVehicleExamineDto.setPurchaseType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
scmEntryVehicleExamineDto.setUserSid(userSid);
scmEntryVehicleExamineDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");
scmEntryVehicleExamineDto.setPrice("");
scmEntryVehicleExamineDto.setDepartureDate(booad.getDepartureDate());
scmEntryVehicleExamineDto.setPurchaseTypeKey(booad.getManPurOrderTypeKey());
scmEntryVehicleExamineDto.setPurchaseType(booad.getManPurOrderTypeValue());
//厂家入库日期
scmEntryVehicleExamineDto.setInboundDate(priceDate);
ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine();
BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
if (StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgSid()) && StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgName())) {
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmEntryVehicleExamineDto.getUserSid()).getData();
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
scmVehicleExamine.setUseOrgSid(useOrgSid);
scmVehicleExamine.setUseOrgName(data.getName());
}
sids.add(scmVehicleExamine.getSid());
list.add(scmVehicleExamine);
}
boolean b = saveBatch(list);
if(b){
return rb.success().setData(sids);
}
return rb;
}
/**
* 手机端-保存验车单
*

41
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java
View File

@ -298,4 +298,45 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
}
return rb.success();
}
public ResultBean saveItem(List<ScmVehinspectItemDto> dtos) {
ResultBean rb = ResultBean.fireFail();
List<ScmVehinspectItemsVo> voList = scmVehicleInspectitemService.selectListOne();
for(ScmVehinspectItemDto s :dtos){
String vehInspectSid=s.getVehInspectSid();
//查询配置项目表中
voList.removeAll(Collections.singleton(null));
if (!voList.isEmpty()) {
voList.stream().forEach(item -> {
ScmVehinspectItem scmVehinspectItem = new ScmVehinspectItem();
String sid = scmVehinspectItem.getSid();
BeanUtil.copyProperties(item, scmVehinspectItem);
scmVehinspectItem.setVehInspectSid(vehInspectSid);
baseMapper.insert(scmVehinspectItem);
List<ScmItemDetailVo> detailsList = item.getDetails();
detailsList.removeAll(Collections.singleton(null));
if (!detailsList.isEmpty()) {
detailsList.stream().forEach(details -> {
ScmVehinspectItemdetail scmVehinspectItemdetail = new ScmVehinspectItemdetail();
BeanUtil.copyProperties(details, scmVehinspectItemdetail);
scmVehinspectItemdetail.setMainSid(sid);
scmVehinspectItemdetailService.insert(scmVehinspectItemdetail);
});
}
List<ScmItemImgVo> itemImgsList = item.getItemImgs();
itemImgsList.removeAll(Collections.singleton(null));
if (!itemImgsList.isEmpty()) {
itemImgsList.stream().forEach(img -> {
ScmVehinspectItemimg scmVehinspectItemimg = new ScmVehinspectItemimg();
BeanUtil.copyProperties(img, scmVehinspectItemimg);
scmVehinspectItemimg.setMainSid(sid);
scmVehinspectItemimgService.insert(scmVehinspectItemimg);
});
}
});
}
}
return rb.success();
}
}
Write Preview
Loading…
Cancel
Save