Skip to content

T
topsun-bpm
Commit b4f984eb authored by 1650842865's avatar 1650842865
Browse files
Options

物料申请取消领导确认环节

parent b02a52a3
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 379 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp
View file @ b4f984eb
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
</button> </button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i <%-- <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>撤销 <%-- class="fa fa-reply"></i>撤销--%>
</button> <%-- </button>--%>
<c:if test="${active==1}"> <%-- <c:if test="${active==1}">--%>
<button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
class="fa fa-sitemap"></i>确认 <%-- class="fa fa-sitemap"></i>确认--%>
</button> <%-- </button>--%>
<button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>回退 <%-- class="fa fa-reply"></i>回退--%>
</button> <%-- </button>--%>
</c:if> <%-- </c:if>--%>
</div> </div>
<br/> <br/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ b4f984eb
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
</button> </button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i <%-- <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>撤销 <%-- class="fa fa-reply"></i>撤销--%>
</button> <%-- </button>--%>
<c:if test="${active==1}"> <%-- <c:if test="${active==1}">--%>
<button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
class="fa fa-sitemap"></i>确认 <%-- class="fa fa-sitemap"></i>确认--%>
</button> <%-- </button>--%>
<button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>回退 <%-- class="fa fa-reply"></i>回退--%>
</button> <%-- </button>--%>
</c:if> <%-- </c:if>--%>
</div> </div>
<br/> <br/>
......
topsun/src/main/java/com/huigou/topsun/base/DefinitionHomepageTaskData.java
View file @ b4f984eb
...@@ -29,18 +29,18 @@ public class DefinitionHomepageTaskData extends BaseApplication { ...@@ -29,18 +29,18 @@ public class DefinitionHomepageTaskData extends BaseApplication {
@Around("execution(public java.util.Map<String, Object> com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl.queryTrackingTasks())") @Around("execution(public java.util.Map<String, Object> com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl.queryTrackingTasks())")
public Map<String, Object> replaceQueryTrackingTasks(){ public Map<String, Object> replaceQueryTrackingTasks(){
// 当前登录用户是否以任务发起人的身份发起过任务流程 // 当前登录用户是否以任务发起人的身份发起过任务流程
List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor(); // List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
for (BsnMessageSponsor sponsor : messageSponsors) { // for (BsnMessageSponsor sponsor : messageSponsors) {
//该流程下是否所有单位已就绪 // //该流程下是否所有单位已就绪
BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId()); // BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId());
//若就绪更新其中流程、流程下审批任务的状态 // //若就绪更新其中流程、流程下审批任务的状态
if(systemExecute!=null){ // if(systemExecute!=null){
systemExecute.setActive(ActiveStatus.UNFINISHED.getValue()); // systemExecute.setActive(ActiveStatus.UNFINISHED.getValue());
sponsor.setStatus(1); // sponsor.setStatus(1);
sponsor.addExecute(systemExecute); // sponsor.addExecute(systemExecute);
bsnMessageApplication.saveBsnMessageSponsor(sponsor); // bsnMessageApplication.saveBsnMessageSponsor(sponsor);
} // }
} // }
//获取任务执行人为当前用户的任务 //获取任务执行人为当前用户的任务
return this.bsnMessageApplication.queryExecuteBsnMessage(); return this.bsnMessageApplication.queryExecuteBsnMessage();
} }
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ b4f984eb
...@@ -239,63 +239,14 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA ...@@ -239,63 +239,14 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED; BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId); NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyBaseInfoRepository.findOne(bizId);
//审批通过,给货源专员发送消息
// if(nonProdApplyBaseInfo.getMaintenanceType().equals("new")) { //新申请的 发布分发人的待办信息 06.17 给货源专员发送消息 if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
//审批通过 Map backMap=new HashMap();
if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意 backMap.put("TYPE","C");
//SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId()); backMap.put("title",nonProdApplyBaseInfo.getBillCode());
//SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId()); backMap.put("positionCode","HYZY");
//publishHyzyMessage(nonProdApplyBaseInfo); nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
Map backMap=new HashMap(); }
backMap.put("TYPE","C");
backMap.put("title",nonProdApplyBaseInfo.getBillCode());
backMap.put("positionCode","HYZY");
nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
}
// }
// if(nonProdApplyBaseInfo.getMaintenanceType().equals("modify")||
// nonProdApplyBaseInfo.getMaintenanceType().equals("extend")
// ){ //变更和扩展的发布 分发信息
//审批通过
/* if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId());
publishHyzyMessage(nonProdApplyBaseInfo);
List<Map<String, String>> deptStaffList=new ArrayList<>();
BsnMessageSponsor sponsor = bsnMessageSponsorRepository.findByBusinessId(nonProdApplyDept.getApplyDeptId());
BsnMessageSponsor newSponsor=new BsnMessageSponsor();
ClassHelper.copyProperties(sponsor,newSponsor);
List<BsnMessageExecute> bsnMsgList=bsnMessageExecuteRepository.findAllByMessageSponsorId(sponsor.getId());
//封装分发数据
// BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
newSponsor.setTaskSponsor(this.getOperator().getUserId());
newSponsor.setBusinessId(newNonProdApplyDept.getApplyDeptId());
//newSponsor.setId(UUID.randomUUID().toString().replaceAll("-",""));
newSponsor.setId("");
newSponsor.setCreateDate(new Date());
newSponsor.setStatus(0);
for (BsnMessageExecute bsnMessageExecute:bsnMsgList){
BsnMessageExecute messageExecute = new BsnMessageExecute();
ClassHelper.copyProperties(bsnMessageExecute,messageExecute);
// bsnMessageExecute.setMessageSponsorId(newSponsor.getId());
messageExecute.setActive(0);
messageExecute.setUpdateDate(new Date());
String msgExeDescribe=messageExecute.getTaskDescribe().replaceAll("数据维护","数据变更");
messageExecute.setTaskDescribe(msgExeDescribe);
messageExecute.setId("");
newSponsor.addExecute(messageExecute);
}
//保存任务
bsnMessageApplication.keepTasks(newSponsor);
//发布任务
bsnMessageApplication.publishTasks(nonProdApplyDept.getApplyDeptId());*/
// }
//}
nonProdApplyBaseInfo.setStatusId(status.getId()); nonProdApplyBaseInfo.setStatusId(status.getId());
nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName()); nonProdApplyBaseInfo.setApprover(getOperator().getPersonMemberName());
nonProdApplyBaseInfo.setApprovalDate(new Date()); nonProdApplyBaseInfo.setApprovalDate(new Date());
...@@ -310,61 +261,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA ...@@ -310,61 +261,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
nonProdApplyBaseInfo.setStatusId(BizBillStatus.ABORTED.getId()); nonProdApplyBaseInfo.setStatusId(BizBillStatus.ABORTED.getId());
nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo); nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
} }
//发布货源专员的待办消息
// private void publishHyzyMessage(NonProdApplyBaseInfo baseInfo){
/*
String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
"left join sa_oporg o on p.CODE=o.code where MAIN_ORG_ID in (select id from sa_oporg where code='HYZY')";
List<Map<String, Object>> mapList = this.sqlExecutorDao.queryToListMap(sql);
for (Map map : mapList) {
// String user = map.get("code").toString();
BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(map.get("id").toString());
bsnMessageSponsor.setTitle(baseInfo.getGenericName());//通用品名
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
if ("product".equals(baseInfo.getKind())) {
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
}
bsnMessageSponsor.setBusinessId(baseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
bsnMessageSponsor.setCreateDate(new Date());
bsnMessageSponsor.setStatus(0);
//List<Map<String, String>> deptStaffList=new ArrayList<>();
//Map <String,String>map=new HashMap<String, String>();
// map.put("");
//deptStaffList.add(map);
// for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute messageExecute = new BsnMessageExecute();
String userCode = map.get("personMemberId").toString();//stringMap.get("userCode");
String deptName = map.get("positionName").toString();//stringMap.get("deptName");
String deptCode = map.get("positionCode").toString();
;//stringMap.get("deptCode");
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
messageExecute.setUpdateDate(new Date());
String mess="-.物料维护(";
if (baseInfo.getMaintenanceType().equals("modify")){
mess="-.物料变更(";
}
if (baseInfo.getMaintenanceType().equals("extend")){
mess="-.物料扩展(";
}
messageExecute.setTaskDescribe(baseInfo.getGenericName() + mess+ deptName + ")");
//保存任务
// bsnMessageApplication.keepTasks(bsnMessageSponsor);
bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
List<BsnMessageExecute> executes = new ArrayList<>();
executes.add(messageExecute);
bsnMessageApplication.saveBsnMessageExecute(executes);
} */
//}
/** /**
* 流程撤销事件 * 流程撤销事件
**/ **/
...@@ -459,40 +356,6 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA ...@@ -459,40 +356,6 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
public Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query) { public Map<String, Object> slicedNonProdApplyBaseInfoQuery(NonProdApplyBaseInfoQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonProdApplyBaseInfoQuery"); QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonProdApplyBaseInfoQuery");
QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query); QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
// if (StringUtil.isNotBlank(query.getMatnr())) {
// model.addCriteria(" and ad.matnr like:matnr");
// model.putLikeParam("matnr", query.getMatnr());
// }
// if (query.getStatus() != null) {
// model.addCriteria(" and t.status =:status");
// model.putParam("status", query.getStatus());
// }
// if (query.getMaintenanceType() != null) {
// model.addCriteria(" and t.maintenance_type =:maintenanceType");
// model.putParam("maintenanceType", query.getMaintenanceType());
// }
// if (query.getGenericName() != null) {
// model.addCriteria(" and t.generic_name =:generic_name");
// model.putParam("genericName", query.getGenericName());
// }
//
// if (query.getMaktx() != null) {
// model.addCriteria(" and ad.maktx like:maktx");
// model.putLikeParam("maktx", query.getMaktx());
// }
// if (query.getBillCode() != null) {
// model.addCriteria(" and t.bill_code like:billCode");
// model.putLikeParam("billCode", query.getBillCode());
// }
// if (query.getStartDate() != null&&!"".equals(query.getStartDate())) {
// model.addCriteria(" and t.created_date >=:startDate");
// model.putParam("startDate", query.getStartDate());
// }
// if (query.getEndDate() != null&&!"".equals(query.getEndDate())) {
// model.addCriteria(" and t.created_date <=:endDate");
// model.putParam("endDate", query.getEndDate());
//
// }
model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType")); model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit")); model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType")); model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
...@@ -626,47 +489,6 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA ...@@ -626,47 +489,6 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
sapNonProdApplyDept.setBaseInfoId(nonProdApplyBaseInfo.getId()); sapNonProdApplyDept.setBaseInfoId(nonProdApplyBaseInfo.getId());
nonProdApplyDeptApplication.save(sapNonProdApplyDept); nonProdApplyDeptApplication.save(sapNonProdApplyDept);
//保存基本信息的维护的待办
// saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
/* 改为推送给 货源专员
BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(operator.getLoginUser().getId());
String genericName=nonProdApplyBaseInfo.getGenericName()!=null?nonProdApplyBaseInfo.getGenericName():"";
if (StringUtils.isBlank(genericName)) {
genericName=sapNonProdApplyDept.getMaktx()!=null?sapNonProdApplyDept.getMaktx():"";
}
bsnMessageSponsor.setTitle(genericName);//通用品名
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
bsnMessageSponsor.setBusinessId(sapNonProdApplyDept.getApplyDeptId());
bsnMessageSponsor.setCreateDate(new Date());
bsnMessageSponsor.setStatus(0);
//List<Map<String, String>> deptStaffList=new ArrayList<>();
//Map <String,String>map=new HashMap<String, String>();
// map.put("");
//deptStaffList.add(map);
// for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute messageExecute = new BsnMessageExecute();
String userCode = operator.getPersonMemberId();//stringMap.get("userCode");
String deptName = operator.getDeptName();//stringMap.get("deptName");
String deptCode = operator.getDeptCode();//stringMap.get("deptCode");
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
messageExecute.setUpdateDate(new Date());
messageExecute.setTaskDescribe(deptName+"产品数据维护");
//保存任务
// bsnMessageApplication.keepTasks(bsnMessageSponsor);
bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());
List<BsnMessageExecute> executes =new ArrayList<>();
executes.add(messageExecute);
bsnMessageApplication.saveBsnMessageExecute(executes); */
// bsnMessageApplication.publishTasks(sapNonProdApplyDept.getApplyDeptId());
Map backMap=new HashMap(); Map backMap=new HashMap();
backMap.put("TYPE","P"); backMap.put("TYPE","P");
backMap.put("title",sapNonProdApplyDept.getMaktx()); //汉语品名 backMap.put("title",sapNonProdApplyDept.getMaktx()); //汉语品名
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ b4f984eb
...@@ -83,8 +83,10 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -83,8 +83,10 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
for (SapNonProdApplyDept sapNonProdApplyDept : applyDeptList) { for (SapNonProdApplyDept sapNonProdApplyDept : applyDeptList) {
if (("ZBCP".equals(sapNonProdApplyDept.getMtart()) if (("ZBCP".equals(sapNonProdApplyDept.getMtart())
|| "ZSHB".equals(sapNonProdApplyDept.getMtart()) || "ZSHB".equals(sapNonProdApplyDept.getMtart())
|| "ZZCP".equals(sapNonProdApplyDept.getMtart())) && !sdo.getString("matnr").equals(sapNonProdApplyDept.getMatnr())){ || "ZZCP".equals(sapNonProdApplyDept.getMtart()))){
isSame = true; if (!sdo.getString("matnr").equals(sapNonProdApplyDept.getMatnr())){
isSame = true;
}
}else { }else {
//如果不是上诉类型的物料，只要查到数据，就存在汉语品名重复 //如果不是上诉类型的物料，只要查到数据，就存在汉语品名重复
isSame = true; isSame = true;
...@@ -135,45 +137,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -135,45 +137,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
nonProdApplyBaseInfoRepository.save(baseInfo); nonProdApplyBaseInfoRepository.save(baseInfo);
NonProdApplyDeptVo deptVo=sdo.toObject(NonProdApplyBasicVo.class); NonProdApplyDeptVo deptVo=sdo.toObject(NonProdApplyBasicVo.class);
/* switch (businessCode) {
case "K":
deptVo = sdo.toObject(NonProdApplyBasicVo.class);
break;
case "C":
deptVo = sdo.toObject(NonProdApplyClassVo.class);
break;
case "V": //销售
deptVo = sdo.toObject(NonProdApplySaleVo.class);
break;
case "E": //采购
deptVo = sdo.toObject(NonProdApplyPurchaseVo.class);
break;
case "D": //MRP
deptVo = sdo.toObject(NonProdApplyMRPVo.class);
break;
case "A": //生产
deptVo = sdo.toObject(NonProdApplyProduceVo.class);
break;
case "L": //存储
deptVo = sdo.toObject(NonProdApplyStoreVo.class);
break;
case "S": //仓库
deptVo = sdo.toObject(NonProdApplyWarehouseVo.class);
break;
case "Q": //质量
deptVo = sdo.toObject(NonProdApplyMassVo.class);
break;
case "B": //财务
deptVo = sdo.toObject(NonProdApplyFinancialVo.class);
break;
case "G": //成本
deptVo = sdo.toObject(NonProdApplyCostVo.class);
break;
default:
deptVo = sdo.toObject(NonProdApplyBasicVo.class);
}*/
// SapNonProdApplyDept nonProdApplyDeptObj = sdo.toObject(SapNonProdApplyDept.class);
//nonProdApplyDeptObj.setBaseInfoId(sdo.getId());
deptVo.setBaseInfoId(sdo.getId()); deptVo.setBaseInfoId(sdo.getId());
SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId()); SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId());
if (nonProdApplyDept==null){ if (nonProdApplyDept==null){
...@@ -182,105 +146,26 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -182,105 +146,26 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
ClassHelper.copyProperties(deptVo,nonProdApplyDept); ClassHelper.copyProperties(deptVo,nonProdApplyDept);
nonProdApplyDept = this.save(nonProdApplyDept); nonProdApplyDept = this.save(nonProdApplyDept);
String applyDeptId=sdo.getString("applyDeptId");
//分发操作
/* if ((StringUtil.isBlank(businessCode)||"INIT_DPT".equals(businessCode))&&"2".equals(sdo.getString("distribute"))) { //业务类型为空 ，表示是基本信息进入的 才保存分发信息
//保存部门分发任务
//获取分发的部门与人员信息
ObjectMapper objectMapper = new ObjectMapper();
String deptStaffJSON = sdo.getString("deptStaff");
List<Map<String, String>> deptStaffList = null;
try {
deptStaffList = objectMapper.readValue(deptStaffJSON, new TypeReference<List<Map<String, String>>>() {
});
if (deptStaffList.size()<1){
throw new RuntimeException("未选择对应的分发人员！");
}
} catch (JsonProcessingException e) {
throw new RuntimeException("JSON转换失败：" + e);
}
if (StringUtils.isBlank(genericName)) {
genericName=nonProdApplyDept.getMaktx()!=null?nonProdApplyDept.getMaktx():"";
}
saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
} */
//不是分发的 提交后产生领导的待办信息 //不是分发的 提交后产生领导的待办信息
if (StringUtil.isBlank(businessCode)&&active ==1&&StringUtil.isBlank(sdo.getString("distribute"))){ //基本信息提交后 发送待分发的待办消息 if (StringUtil.isBlank(businessCode)&&active ==1&&StringUtil.isBlank(sdo.getString("distribute"))){ //基本信息提交后 发送待分发的待办消息
//调用SAP进行校验 //调用SAP进行校验
baseInfo.setCheckFlag("X"); //baseInfo.setCheckFlag("X");
String backStr=sendSapMaterialData(baseInfo,nonProdApplyDept); String backStr=sendSapMaterialData(baseInfo,nonProdApplyDept);
if (StringUtil.isNotBlank(backStr)) { if (StringUtil.isNotBlank(backStr)) {
throw new RuntimeException(backStr); throw new RuntimeException(backStr);
}else { }else {
//先结束 基本信息的待办 //产生领导确认的待办信息 取消确认节点 2024.11.21
BsnMessageSponsor bsnMessageSponsor2 = bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId()); // Map backMap = new HashMap();
if (bsnMessageSponsor2 != null) { // backMap.put("TYPE", "D");
List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId()); // backMap.put("title", nonProdApplyDept.getMaktx()); //汉语品名
for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) { // backMap.put("positionCode", "LDQR");
if ("HYZY".equals(bsnMessageExecute.getBusinessCode())) { // saveBsnMessageData(baseInfo, backMap);
bsnMessageApplication.submitTask(bsnMessageExecute.getId());
}
}
}
//产生领导确认的待办信息
Map backMap = new HashMap();
backMap.put("TYPE", "D");
backMap.put("title", nonProdApplyDept.getMaktx()); //汉语品名
backMap.put("positionCode", "LDQR");
saveBsnMessageData(baseInfo, backMap);
} }
} }
/* if (active!=null&&active == 2&&opstatus.equals("1")){//各部门都提交后，隐藏消息
bsnMessageApplication.submitTask(meId);
//如果所有的业务部门处理完 ，则推送SAP
BsnMessageSponsor bsnMessageSponsor=bsnMessageSponsorRepository.findByBusinessId(nonProdApplyDept.getApplyDeptId());
boolean canSended=true;
if (bsnMessageSponsor!=null){
List<BsnMessageExecute> bsnMsgList = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList) {
if (!"system".equals(bsnMessageExecute.getBusinessCode())&&
!"HYZY".equals(bsnMessageExecute.getBusinessCode())&&
!"INIT_DPT".equals(bsnMessageExecute.getBusinessCode())
&&bsnMessageExecute.getActive() == 0) {
canSended=false;
break;
}
}
//结束货源专员的待办
BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
if (bsnMessageSponsor2!=null){
List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
if ("HYZY".equals(bsnMessageExecute.getBusinessCode())) {
bsnMessageApplication.submitTask(bsnMessageExecute.getId());
}
}
}
}
if (canSended) {
String backStr=sendSapData(baseInfo, nonProdApplyDept);
map.put("result",backStr);
}
}*/
map.put("applyDeptId",nonProdApplyDept.getApplyDeptId()); map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
return map; return map;
} }
private String getRootId(String id,List <Map <String,Object>>baseList){
String rootId="";
for (Map map:baseList){
if (id.equals(map.get("id").toString())) {
if (StringUtils.isBlank(map.get("sourceId").toString())) {
rootId = map.get("id").toString();
break;
} else {
rootId = getRootId(map.get("sourceId").toString(), baseList);
}
}
}
return rootId;
}
@Override @Override
public SapNonProdApplyDept save(SapNonProdApplyDept sapNonProdApplyDept){ public SapNonProdApplyDept save(SapNonProdApplyDept sapNonProdApplyDept){
return nonProdApplyDeptRepository.save(sapNonProdApplyDept); return nonProdApplyDeptRepository.save(sapNonProdApplyDept);
...@@ -520,6 +405,16 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -520,6 +405,16 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
baseInfo.setDistribute(2); //已办结 baseInfo.setDistribute(2); //已办结
nonProdApplyBaseInfoRepository.save(baseInfo); nonProdApplyBaseInfoRepository.save(baseInfo);
} }
//先结束 基本信息的待办
BsnMessageSponsor bsnMessageSponsor2 = bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
if (bsnMessageSponsor2 != null) {
List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
if ("HYZY".equals(bsnMessageExecute.getBusinessCode())) {
bsnMessageApplication.submitTask(bsnMessageExecute.getId());
}
}
}
} else { } else {
//更改到到提交状态 //更改到到提交状态
baseInfo.setDistribute(0); baseInfo.setDistribute(0);
...@@ -554,7 +449,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -554,7 +449,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
} }
final void mapCopy(Map resultMap, Map paramMap) { public void mapCopy(Map resultMap, Map paramMap) {
if (resultMap==null) resultMap=new HashMap(); if (resultMap==null) resultMap=new HashMap();
if (paramMap==null ) return ; if (paramMap==null ) return ;
...@@ -569,7 +464,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -569,7 +464,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
/* /*
* 审批完成 推送处理基本信息的待办消息 * 审批完成 推送处理基本信息的待办消息
* 最后一个业务务部门 处理完成推送SAP失败 则向货源专员发起再次分发的待办消息
* 推送SAP成功则向货源专员 写入一条成功的消息 * 推送SAP成功则向货源专员 写入一条成功的消息
*/ */
public void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap) { public void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap) {
...@@ -643,36 +537,36 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -643,36 +537,36 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
@Override @Override
public Map<String,Object> confirmNonProdApplyDept(SDO sdo){ public Map<String,Object> confirmNonProdApplyDept(SDO sdo){
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("result",""); // map.put("result","");
String confirm=sdo.getString("confirm"); // String confirm=sdo.getString("confirm");
String baseId=sdo.getString("id"); // String baseId=sdo.getString("id");
NonProdApplyBaseInfo baseInfo=nonProdApplyBaseInfoRepository.findOne(baseId); // NonProdApplyBaseInfo baseInfo=nonProdApplyBaseInfoRepository.findOne(baseId);
//先结束 领导确认的待办 // //先结束 领导确认的待办
BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId()); // BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
if (bsnMessageSponsor2!=null){ // if (bsnMessageSponsor2!=null){
List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId()); // List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) { // for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
if ("LDQR".equals(bsnMessageExecute.getBusinessCode())) { // if ("LDQR".equals(bsnMessageExecute.getBusinessCode())) {
bsnMessageApplication.submitTask(bsnMessageExecute.getId()); // bsnMessageApplication.submitTask(bsnMessageExecute.getId());
} // }
} // }
} // }
SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId()); // SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId());
if ("2".equals(confirm)){//确认 // if ("2".equals(confirm)){//确认
// 推送SAP // // 推送SAP
baseInfo.setCheckFlag(""); // baseInfo.setCheckFlag("");
String backStr=sendSapMaterialData(baseInfo,nonProdApplyDept); // String backStr=sendSapMaterialData(baseInfo,nonProdApplyDept);
map.put("result",backStr); // map.put("result",backStr);
} else { //回退给货源专员 // } else { //回退给货源专员
//产生货源专员的待办信息 // //产生货源专员的待办信息
Map backMap=new HashMap(); // Map backMap=new HashMap();
backMap.put("TYPE","D"); // backMap.put("TYPE","D");
backMap.put("title",nonProdApplyDept.getMaktx()); //汉语品名 // backMap.put("title",nonProdApplyDept.getMaktx()); //汉语品名
backMap.put("positionCode","HYZY"); // backMap.put("positionCode","HYZY");
saveBsnMessageData(baseInfo,backMap); // saveBsnMessageData(baseInfo,backMap);
baseInfo.setDistribute(0);//改回待 提交状态 // baseInfo.setDistribute(0);//改回待 提交状态
nonProdApplyBaseInfoRepository.save(baseInfo); // nonProdApplyBaseInfoRepository.save(baseInfo);
} // }
return map; return map;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment