Browse Source

对接物流地址ID;费用申请审批附件显示异常;个人组异常修复

v1.0
Yen 2 years ago
parent
commit
77047d6624
  1. 4
      src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
  2. 2
      src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java
  3. 4
      src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java
  4. 5
      src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
  5. 1
      src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java
  6. 29
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
  7. 17
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
  8. 2
      src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml

4
src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@ -332,7 +332,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
BigDecimal dispatchSumAmt = dispatchDataMapper.querySumCostAmt(startMonthNum,endMonthNum,supplierCodeList);
if(dispatchSumAmt == null || dispatchSumAmt.compareTo(BigDecimal.ZERO)<=0) {
return percent;
//-1表无发货值
return -1F;
//return percent;
}
BigDecimal costSumAmt = baseMapper.querySumAmt(costDTO);

2
src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java

@ -59,9 +59,11 @@ public class BizUserGroupApplicationService {
}
Long groupId = bizUserGroup.getId();
//移除历史ITEM
if(param.getEditGroupFlag().equals(1)){
LambdaQueryWrapper<BizUserGroupItem> itemLqw = new LambdaQueryWrapper<>();
itemLqw.eq(BizUserGroupItem::getGroupId,groupId);
bizUserGroupItemService.remove(itemLqw);
}
//保存item
List<BizUserGroupItem> groupItemList = new ArrayList<>();
for (BizUserGroupBatchBo.Item item : param.getItems()) {

4
src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java

@ -179,5 +179,9 @@ public class OmsXltOrder implements Serializable {
@JsonIgnore
@JsonProperty
private Boolean delFlag;
/** 物流系统的id */
private String tmsSysId;
}

5
src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@ -485,6 +485,11 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
//状态:0未使用;1报价单;2销售订单
xltOrder.setStatus(0);
//补充:调度系统写报价单给ERP时,要把地址ID写过去
if(supplierAddress.getTmsSysId()==null){
Assert.throwEx("地址缺失TmsSysId关联");
}
xltOrder.setTmsSysId(supplierAddress.getTmsSysId());
xltOrder.setEmpName(omsOrder.getUserName());
xltOrder.setCusCode(omsOrder.getSupplierCode());
xltOrder.setCusName(omsOrder.getSupplierName());

1
src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java

@ -100,4 +100,5 @@ public class SysUserFlowApplication {
SysUser sysUser = sysUserMapper.selectById(targetUserId);
tzcPolicyMapper.updatePolicyExtUser(sourUserId,sysUser);
}
}

29
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@ -133,9 +133,23 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
selectUserIds.add(user.getSyUserId());
}
}
if(selectUserIds.size()==0){
Assert.throwEx("选中的用户未绑定OA凭证");
}
List<CtpAffairVo> rList = this.pageAffair(param.getTargetId()).getData();
String affairId = null;
if(rList.size()>0){
CtpAffair affair = rList.get(0).getAffairInfo();
if(affair!=null){
affairId = affair.getAffairId();
}
}
if(affairId==null&&param.getAttachIds()!=null&&param.getAttachIds().length>0){
return R.error("附件上传失败(如果急需提交请移除附件)");
}
addNodeDTO.setUserIds(selectUserIds);
SysUser sysUser = getUserMapper().selectById(AuthContextUtils.getSysUserId());
addNodeDTO.setUserCode(sysUser.getAccount());
@ -147,6 +161,21 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
addNodeDTO.setTemplateCode(templateCode);
R<String> result = getRequestService().addNode(addNodeDTO);
if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){
DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
DataAffairCommit dataAffairCommit = new DataAffairCommit();
dataAffairCommit.setTargetCode(getTemplateCode());
dataAffairCommit.setTargetId(param.getTargetId());
dataAffairCommit.setId(affairId);
dataAffairCommit.setCommentVal("加签:"+param.getComment());
dataAffairCommit.setReleaseFlag(0);
dataAffairCommit.setState(3);
dataAffairCommit.setUserId(sysUser.getId());
dataAffairCommit.setUserCode(sysUser.getCode());
dataAffairCommit.setUserName(sysUser.getName());
dataAffairCommit.setResultData("addNode");
dataAffairCommit.setAttachIds(param.getAttachIds());
dataAffairCommitMapper.insert(dataAffairCommit);
return R.ok();
}
return R.error(result.getMsg());

17
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -967,22 +967,23 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
*/
public void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> data) {
YtdQtdToOAVo ytdQtdToOAVo = birRoiRateService.buildYtdAndQtdData(tbsCostApply);
String defaultNum = "-2";
data.put("ytdCusExpenseRate",ytdQtdToOAVo.getYtdCustomerPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("ytdEmpExpenseRate",ytdQtdToOAVo.getYtdUserPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("ytdAdminiExpenseRate",ytdQtdToOAVo.getYtdRegionPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("ytdSalesExpenseRate",ytdQtdToOAVo.getYtdRegion2Percent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("cusExpenseRate",ytdQtdToOAVo.getQtdCustomerPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("empExpenseRate",ytdQtdToOAVo.getQtdUserPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("salesExpenseRate",ytdQtdToOAVo.getQtdRegionPercent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
data.put("adminiExpenseRate",ytdQtdToOAVo.getQtdRegion2Percent()==null?
"0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
//插入记录表前移除历史记录
// tbsCostPercentMapper.delByCostApplyId(tbsCostApply.getId());

2
src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml

@ -7,7 +7,7 @@
update vtb_verification
set ext_user_id = #{obj.id},ext_user_id=#{obj.code},ext_user_name=#{obj.name}
where del_flag=0 and cost_apply_id in
<foreach collection="checkIds" item="selectId" index="i" open="(" close=")" separator=",">
<foreach collection="costIds" item="selectId" index="i" open="(" close=")" separator=",">
#{selectId}
</foreach>
</update>

Loading…
Cancel
Save