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

修复问题+排产消息推送修改

master
dimengzhe 3 years ago
parent
64cf22b931
commit
f3a984a3bd
4 changed files with 53 additions and 10 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-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  2. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  4. 52
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
View File

@ -552,7 +552,7 @@
and bv.useOrgSid = #{orgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
as quantity from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid
where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid and
bo.state = 0) AS
produceCarNum

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

@ -337,7 +337,8 @@
bvm.announcementModel,
bvm.specifications,
bmc.packingCase,
bvm.insideCode
bvm.insideCode,
bmc.rearAxleValue
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@ -569,7 +570,7 @@
#{useOrgSid}) AS nowCarNum,
(select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
as quantity from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid
where bo.useOrgSid = #{useOrgSid} AND bd.vehicleSid = bvm.sid AND bo.state = 0) AS produceCarNum
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -535,6 +535,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
list1.add(getConfigValueSpanSize("细分市场", currentCarVo.getMarketSegments()));
list1.add(getConfigValueSpanSize("规格型号", currentCarVo.getSpecifications()));
list1.add(getConfigValueSpanSize("系别", currentCarVo.getDepartment()));
// list1.add(getConfigValueSpanSize("公告型号", currentCarVo.getAnnouncementModel(), 1));
// list1.add(getConfigValueSpanSize("货箱", currentCarVo.getPackingCase(), 1));
// list1.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1));
@ -550,7 +551,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
list2.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio()));
list2.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio()));
list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
@ -564,6 +565,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank()));
list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
list2.add(getConfigValueSpanSize("后桥",configVo.getRearAxleValue()));
configDetailVo.setConfigInfo(list2);
//更多配置
String otherConfig = configVo.getOtherConfig();

52
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -52,9 +52,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowableDto;
import com.yxt.messagecenter.api.message.MessageJsonDto;
import com.yxt.messagecenter.api.message.*;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
import org.apache.commons.lang3.StringUtils;
@ -383,7 +381,17 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, busVehicleApply);
return voResultBean;
}
if (r == 2) {
@ -522,8 +530,20 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
log.error(e.getMessage());
}
} else {
//极光推送
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
ufVo.setProcInsId(busVehicleApply.getProcInstId());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
ufVo.setProcInsId(busVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {
@ -659,8 +679,28 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
busVehicleApply = fetchBySid(businessSid);
String msgSid = getMessage(ufVo, appMap, busVehicleApply);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo,messageFlowVo);
String procId = busVehicleApply.getProcInstId();
ufVo.setProcInsId(procId);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("厂家采购申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())){
messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
}else{
messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
}
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}

Write Preview
Loading…
Cancel
Save