diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index fcd99022..07313abd 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -332,7 +332,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl itemLqw = new LambdaQueryWrapper<>(); - itemLqw.eq(BizUserGroupItem::getGroupId,groupId); - bizUserGroupItemService.remove(itemLqw); + if(param.getEditGroupFlag().equals(1)){ + LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); + itemLqw.eq(BizUserGroupItem::getGroupId,groupId); + bizUserGroupItemService.remove(itemLqw); + } //保存item List groupItemList = new ArrayList<>(); for (BizUserGroupBatchBo.Item item : param.getItems()) { diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java index 28f45108..1b8c9728 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java +++ b/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; + } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index de832e4d..3838ba5a 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -485,6 +485,11 @@ public class OmsOrderServiceImpl extends ServiceImpl 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()); diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java index 2d1a2682..ec093f92 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java +++ b/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); } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index d1e3a624..0a22d6da 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/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 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&¶m.getAttachIds()!=null&¶m.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 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()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 008529ba..e3a3b0ff 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -967,22 +967,23 @@ public class TbsCostApplyServiceImpl extends ServiceImpl 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()); diff --git a/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml b/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml index f915d573..ea8a03a6 100644 --- a/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml +++ b/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 - + #{selectId}