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

Merge pull request 'demand: 新增TMS站点批次操作日志管理页面。删除批次增加操作日志。批次新增/删除运单增加操作日志' (#139) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/139
This commit is contained in:
heyu 2025-07-30 17:19:13 +08:00
commit 93c9f7ed84
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -4955,6 +4955,20 @@ public class EmisBaseService {
List<List<EmisTransPlanRule>> allPaths = new ArrayList<>();
getAllPaths(rule, new ArrayList<>(), allPaths);
// 检查是否为特殊运输线路类型或清关类型
boolean isSpecialTransLine = "004".equals(waybill.getTransLineType()) &&
("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType()));
boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType());
if (isSpecialTransLine || isSpecialCustomsClear) {
// 移除每个路径的最后一个元素
for (List<EmisTransPlanRule> path : allPaths) {
if (!path.isEmpty()) {
path.remove(path.size() - 1);
}
}
}
// 2. 统计每条路径的匹配度
Map<List<EmisTransPlanRule>, Integer> pathMatchCountMap = new HashMap<>();
for (List<EmisTransPlanRule> path : allPaths) {
@ -5226,6 +5240,9 @@ public class EmisBaseService {
public void handleVirtualForUpdate(EmisWaybill emisWaybillSave, EmisWaybill emisWaybillOld) throws EmisBizError {
if (!StringUtils.isEmpty(emisWaybillSave.getBlVirtual()) && "1".equals(emisWaybillSave.getBlVirtual())) {
if(emisWaybillSave.getMasterBillCode().equals(emisWaybillOld.getMasterBillCode())){
return;
}
handleVirtual(emisWaybillSave, emisWaybillOld);
} else {
String masterBillCode = emisWaybillOld.getMasterBillCode();

4
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -3838,9 +3838,9 @@
</insert>
<select id="selectWaybillListBySiteBatchStatus" resultMap="EmisWaybillResult">
select a.id, a.bill_code,a.trans_line_type,
a.product_type,a.start_site_code,a.send_site_code,a.problem_type,a.virtual_remark
select a.*,k.trans_type
from emis_waybill a
left join emis_trans_line k on a.trans_line_type=k.line_code and k.del_flag='0'
where a.del_flag = '0'
<if test="lineCode != null and lineCode != ''">
and a.trans_line_type = #{lineCode}