aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 批次规则批量修改，扫描漏组批次过滤线路014' (#79) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/79
This commit is contained in:
heyu 2025-06-30 13:08:40 +08:00
commit cfcf6678ef
4 changed files with 173 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransPlanRuleController.java
View File

@ -116,6 +116,41 @@ public class EmisTransPlanRuleController extends EmisBaseController {
return toAjax(emisTransPlanRuleService.updateEmisTransPlanRule(emisTransPlanRule));
}
/**
* 批量修改供应商线路规划
*/
@PreAuthorize("@ss.hasPermi('emis:emisTransPlanRule:batchEdit')")
@PutMapping("/batchEdit")
public AjaxResult batchEdit(@RequestBody List<EmisTransPlanRule> emisTransPlanRuleList) {
JSONObject jObjOut = new JSONObject();
String result = "success";
String msg = "批量修改成功";
try {
int successCount = emisTransPlanRuleService.batchUpdateEmisTransPlanRule(emisTransPlanRuleList);
jObjOut.put("successCount", successCount);
jObjOut.put("totalCount", emisTransPlanRuleList.size());
msg = "批量修改成功，成功修改 " + successCount + " 条记录";
} catch (EmisBizError ex) {
ex.printStackTrace();
result = "fail";
msg = ex.getErrorCode() + ":" + ex.getMessage();
} catch (DuplicateKeyException e) {
e.printStackTrace();
result = "fail";
msg = "数据重复";
} catch (Exception ex) {
result = "fail";
ex.printStackTrace();
msg = "系统异常:" + ex.getMessage();
if (ex instanceof EmisBizError) {
msg = ((EmisBizError) ex).getErrorCode() + ":" + ex.getMessage();
}
}
jObjOut.put("result", result);
jObjOut.put("msg", msg);
return AjaxResult.success("成功", jObjOut);
}
/**
* 删除供应商线路规划
*/

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTransPlanRuleService.java
View File

@ -82,4 +82,12 @@ public interface IEmisTransPlanRuleService {
* @return 循环引用提示信息列表
*/
List<String> checkTree(EmisTransPlanRule emisTransPlanRule);
/**
* 批量修改供应商线路规划
*
* @param emisTransPlanRuleList 供应商线路规划列表
* @return 结果
*/
int batchUpdateEmisTransPlanRule(List<EmisTransPlanRule> emisTransPlanRuleList) throws EmisBizError;
}

129
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java
View File

@ -99,6 +99,22 @@ public class EmisTransPlanRuleServiceImpl extends EmisBaseService implements IEm
*/
@Override
public int updateEmisTransPlanRule(EmisTransPlanRule emisTransPlanRule) throws EmisBizError {
// 校验非空
checkCode(emisTransPlanRule);
checkDate(emisTransPlanRule);
// 检查重复（排除自身）
checkDuplicateForUpdate(emisTransPlanRule);
// 校验循环引用
EmisTransPlanRule checkRule = new EmisTransPlanRule();
checkRule.setProductType(emisTransPlanRule.getProductType());
List<EmisTransPlanRule> allRules = emisTransPlanRuleMapper.selectEmisTransPlanRuleListWithoutName(checkRule);
// 移除当前要修改的规则，避免自己与自己比较
allRules.removeIf(rule -> rule.getId().equals(emisTransPlanRule.getId()));
allRules.add(emisTransPlanRule);
buildTree(allRules, emisTransPlanRule);
return emisTransPlanRuleMapper.updateEmisTransPlanRule(emisTransPlanRule);
}
@ -370,6 +386,119 @@ public class EmisTransPlanRuleServiceImpl extends EmisBaseService implements IEm
return buildTreeForCheck(allRules);
}
/**
* 批量修改供应商线路规划
*
* @param emisTransPlanRuleList 供应商线路规划列表
* @return 结果
*/
@Override
@Transactional
public int batchUpdateEmisTransPlanRule(List<EmisTransPlanRule> emisTransPlanRuleList) throws EmisBizError {
if (emisTransPlanRuleList == null || emisTransPlanRuleList.isEmpty()) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "批量修改数据不能为空");
}
int successCount = 0;
for (EmisTransPlanRule emisTransPlanRule : emisTransPlanRuleList) {
try {
// 校验非空
checkCode(emisTransPlanRule);
checkDate(emisTransPlanRule);
// 检查重复（排除自身）
checkDuplicateForUpdate(emisTransPlanRule);
// 校验循环引用
EmisTransPlanRule checkRule = new EmisTransPlanRule();
checkRule.setProductType(emisTransPlanRule.getProductType());
List<EmisTransPlanRule> allRules = emisTransPlanRuleMapper
.selectEmisTransPlanRuleListWithoutName(checkRule);
// 移除当前要修改的规则，避免自己与自己比较
allRules.removeIf(rule -> rule.getId().equals(emisTransPlanRule.getId()));
allRules.add(emisTransPlanRule);
buildTree(allRules, emisTransPlanRule);
// 执行更新
int result = emisTransPlanRuleMapper.updateEmisTransPlanRule(emisTransPlanRule);
if (result > 0) {
successCount++;
}
} catch (Exception e) {
log.error("批量修改供应商线路规划失败，ID: {}, 错误: {}", emisTransPlanRule.getId(), e.getMessage());
throw new EmisBizError(EmisBizErrorType.SYS_EXCEPTION,
"批量修改失败，ID: " + emisTransPlanRule.getId() + ", 错误: " + e.getMessage());
}
}
return successCount;
}
/**
* 检查重复（用于更新操作，排除自身）
*/
private void checkDuplicateForUpdate(EmisTransPlanRule emisTransPlanRule) throws EmisBizError {
// 检查正向规则（起始网点到下一网点）
List<EmisTransPlanRule> existingRules = checkDuplicateDirectionForUpdate(emisTransPlanRule,
emisTransPlanRule.getStartSiteCode(), emisTransPlanRule.getNextSiteCode());
if (existingRules != null && !existingRules.isEmpty()) {
throw new EmisBizError(EmisBizErrorType.EXISTS, "已存在相同的规则配置");
}
// 检查反向规则（下一网点到起始网点）
List<EmisTransPlanRule> existingRules1 = checkDuplicateDirectionForUpdate(emisTransPlanRule,
emisTransPlanRule.getNextSiteCode(), emisTransPlanRule.getStartSiteCode());
if (existingRules1 != null && !existingRules1.isEmpty()) {
throw new EmisBizError(EmisBizErrorType.EXISTS, "已存在相同的规则配置");
}
}
/**
* 检查重复方向（用于更新操作，排除自身）
*/
private List<EmisTransPlanRule> checkDuplicateDirectionForUpdate(EmisTransPlanRule emisTransPlanRule,
String startSiteCode, String nextSiteCode) {
// 构建查询条件
EmisTransPlanRule queryRule = new EmisTransPlanRule();
queryRule.setLineCode(emisTransPlanRule.getLineCode());
queryRule.setStartSiteCode(startSiteCode);
queryRule.setNextSiteCode(nextSiteCode);
queryRule.setStartDate(emisTransPlanRule.getStartDate());
queryRule.setEndDate(emisTransPlanRule.getEndDate());
// 查询所有匹配的规则
List<EmisTransPlanRule> allRules = emisTransPlanRuleMapper.checkDuplicate(queryRule);
if (allRules == null || allRules.isEmpty()) {
return new ArrayList<>();
}
// 排除自身
allRules.removeIf(rule -> rule.getId().equals(emisTransPlanRule.getId()));
if (allRules.isEmpty()) {
return new ArrayList<>();
}
// 检查productType和supplierCode是否有交集
String newProductType = emisTransPlanRule.getProductType();
String newSupplierCode = emisTransPlanRule.getSupplierCode();
for (EmisTransPlanRule existingRule : allRules) {
// 检查产品类型是否有交集
boolean productTypeOverlap = hasOverlap(newProductType, existingRule.getProductType());
// 检查供应商编码是否有交集
boolean supplierCodeOverlap = hasOverlap(newSupplierCode, existingRule.getSupplierCode());
// 如果产品类型和供应商编码都有交集，则认为重复
if (productTypeOverlap && supplierCodeOverlap) {
return Arrays.asList(existingRule);
}
}
return new ArrayList<>();
}
/**
* 仅校验循环引用并收集所有循环引用提示
*

1
emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
View File

@ -335,6 +335,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="emisTransPlanRule.supplierCode != null and emisTransPlanRule.supplierCode != ''">and ( FIND_IN_SET(#{emisTransPlanRule.supplierCode},r.supplier_code) )</if>
<if test="emisTransPlanRule.startDate != null">and r.start_date = #{emisTransPlanRule.startDate}</if>
<if test="emisTransPlanRule.endDate != null">and r.end_date = #{emisTransPlanRule.endDate}</if>
and r.line_code!='014'
</where>
order by id desc
limit #{limit} offset #{offset}