Browse Source

更新

master
常熟吴彦祖 5 months ago
parent
commit
738641fa21
  1. 14
      src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java
  2. 13
      src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java
  3. 5
      src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java
  4. 45
      src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java
  5. 28
      src/main/resources/mapper/srm/SrmSupplierMapper.xml

14
src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java

@ -156,6 +156,20 @@ public class SrmSupplierController {
return R.ok().put("row",row);
}
/**
* @Description 按site查询供应商文档类型(去重) - rqrq
* @author rqrq
*/
@PostMapping(value = "/listSupplierDocTypeBySite")
@ResponseBody
public R listSupplierDocTypeBySite(@RequestBody SrmSupplierData data) {
if (data == null || data.getSite() == null || data.getSite().trim().isEmpty()) {
return R.error("site 不能为空");
}
List<String> rows = srmSupplierService.listSupplierDocTypeBySite(data.getSite());
return R.ok().put("rows", rows);
}
/** 首页:资质文档 validTo 早于今天+7 天的供应商(当前用户可见),返回数量与 id 列表 */
@PostMapping(value = "/supplierDocExpireReminder")
@ResponseBody

13
src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java

@ -26,8 +26,9 @@ public interface SrmSupplierMapper extends BaseMapper<SrmSupplier> {
IPage<SrmSupplierGroupRequsetData> queryPage(Page<SrmSupplierGroupRequsetData> page, @Param("query") SrmSupplierGroupRequsetData data);
void saveSrmSupplierGroupRequsetData(SrmSupplierGroupRequsetData data);
void confirmRequest(SrmSupplierGroupRequsetData data);
void updateSupplierGroup(SrmSupplierGroupRequsetData data);
int confirmRequest(SrmSupplierGroupRequsetData data);
int updateSupplierGroup(SrmSupplierGroupRequsetData data);
SrmSupplierGroupRequsetData getSupplierGroupRequestById(@Param("id") Integer id);
List<SrmSupplierContractData> getNewSupplierContract(SrmSupplierContractData data);
@ -65,6 +66,14 @@ public interface SrmSupplierMapper extends BaseMapper<SrmSupplier> {
PurQuotationHeaderData getSupplierInfo(SrmSupplier supplier);
/**
* @Description 按site查询供应商文档类型(去重) - rqrq
* @param site 站点
* @return 文档类型列表
* @author rqrq
*/
List<String> listSupplierDocTypeBySite(@Param("site") String site);
/**
* 合同 srm_supplierContract.validTo 早于「今天+7天」且存在对应续约申请行时,返回 srm_contractRequset.id(已按供应商权限过滤)
*/

5
src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java

@ -53,6 +53,11 @@ public interface SrmSupplierService {
PurQuotationHeaderData getSupplierInfo(SrmSupplier supplier);
/**
* 按site查询供应商文档类型(去重) - rqrq
*/
List<String> listSupplierDocTypeBySite(String site);
/**
* 首页提醒:关联合同 validTo &lt; 今天+7 天的续约申请(当前用户可见供应商),返回申请 id 列表与数量
*/

45
src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java

@ -94,12 +94,43 @@ public class SrmSupplierServiceImpl extends ServiceImpl<SrmSupplierMapper, SrmSu
@Override
@Transactional
public void confirmRequest(SrmSupplierGroupRequsetData data){
srmSupplierMapper.confirmRequest(data);
if (data.getStatus().equals("审批通过")) {
srmSupplierMapper.updateSupplierGroup(data);
if (data == null || data.getId() == null) {
throw new RuntimeException("审批记录ID不能为空");
}
int confirmCount = srmSupplierMapper.confirmRequest(data);
if (confirmCount <= 0) {
throw new RuntimeException("审批记录不存在或已删除");
}
String status = data.getStatus() == null ? "" : data.getStatus().trim();
if (isApprovedStatus(status)) {
// 审批通过后按申请主记录回查并更新供应商等级,避免前端漏传关键字段 - rqrq
SrmSupplierGroupRequsetData requestData = srmSupplierMapper.getSupplierGroupRequestById(data.getId());
if (requestData == null) {
throw new RuntimeException("审批记录不存在,无法更新供应商等级");
}
if (requestData.getSite() == null || requestData.getSite().trim().isEmpty()
|| requestData.getSupplierNo() == null || requestData.getSupplierNo().trim().isEmpty()
|| requestData.getNewSupplierGroup() == null || requestData.getNewSupplierGroup().trim().isEmpty()) {
throw new RuntimeException("审批记录缺少供应商等级更新所需字段");
}
int updateCount = srmSupplierMapper.updateSupplierGroup(requestData);
if (updateCount <= 0) {
throw new RuntimeException("未找到对应供应商,供应商等级更新失败");
}
}
}
/**
* 审批通过状态判断 - rqrq
*/
private boolean isApprovedStatus(String status) {
return "审批通过".equals(status)
|| "通过".equals(status)
|| "审批".equals(status)
|| "APPROVED".equalsIgnoreCase(status)
|| "已通过".equals(status);
}
@Override
public List<SrmSupplierContractData> getNewSupplierContract(SrmSupplierContractData data){
List<SrmSupplierContractData> result= srmSupplierMapper.getNewSupplierContract(data);
@ -298,6 +329,14 @@ public class SrmSupplierServiceImpl extends ServiceImpl<SrmSupplierMapper, SrmSu
return baseMapper.getSupplierInfo(supplier);
}
@Override
public List<String> listSupplierDocTypeBySite(String site) {
if (site == null || site.trim().isEmpty()) {
return Collections.emptyList();
}
return srmSupplierMapper.listSupplierDocTypeBySite(site.trim());
}
@Override
public Map<String, Object> getSupplierContractRequestExpireReminder(String site) {
SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();

28
src/main/resources/mapper/srm/SrmSupplierMapper.xml

@ -223,6 +223,25 @@
<update id="updateSupplierGroup">
update srm_supplier set supplier_group=#{newSupplierGroup} where site=#{site} and supplier_no=#{supplierNo}
</update>
<!-- rqrq - 审批后按id回查申请主数据,避免前端参数缺失导致供应商等级未更新 -->
<select id="getSupplierGroupRequestById" resultType="SrmSupplierGroupRequsetData">
SELECT TOP 1
id,
site,
request_no,
request_date,
supplier_no,
old_supplier_group,
new_supplier_group,
reason,
status,
create_date,
create_by,
update_date,
update_by
FROM srm_supplierGroupRequset
WHERE id = #{id}
</select>
<select id="getNewSupplierContract" resultType="SrmSupplierContractData">
select a.id,a.site,a.contractId,a.supplierNo,a.contractDate,a.validTo,a.amout,a.currency,a.contractNo,a.contractName,a.contractDetail,
a.create_by,a.create_date,a.update_by,a.update_date,b.supplier_name,a.needRenew
@ -456,6 +475,15 @@
AND ss.supplier_no = #{supplierNo}
</select>
<!-- rqrq - 按site查询供应商文档类型下拉(去重) -->
<select id="listSupplierDocTypeBySite" resultType="java.lang.String">
SELECT DISTINCT supplier_doc_type
FROM srm_supplier_document_list_definition
WHERE site = #{site}
AND ISNULL(supplier_doc_type, '') != ''
ORDER BY supplier_doc_type
</select>
<!-- 关联合同 validTo 在「今天+7天」之前,且存在续约申请;返回申请主键 id,供应商权限见 b -->
<select id="selectContractRequestIdsWithContractValidToWithin7Days" resultType="java.lang.Integer">
SELECT DISTINCT a.id

Loading…
Cancel
Save