diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java index 59e24c334..1c777b812 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java @@ -13,8 +13,10 @@ package com.xdadan.erp.emis.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.xdadan.erp.common.annotation.audit.DataAuditField; +import com.xdadan.erp.common.annotation.audit.DataAuditTable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.xdadan.erp.common.annotation.Excel; @@ -35,6 +37,8 @@ import lombok.Data; * @date 2024-06-07 04:52:26 */ @Data +@TableName("emis_tms_site_batch") +@DataAuditTable(tableName = "emis_tms_site_batch",tableComment = "组批次表",bizKey="batchNo") public class EmisTmsSiteBatch extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java index 1bf689d90..6b74fe6e6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java @@ -12,8 +12,12 @@ package com.xdadan.erp.emis.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.common.annotation.audit.DataAuditLog; +import com.xdadan.erp.common.annotation.audit.OperateType; import com.xdadan.erp.emis.domain.EmisTmsSiteBatch; import com.xdadan.erp.emis.domain.EmisWaybill; +import com.xdadan.erp.emis.service.impl.EmisTmsSiteBatchServiceImpl; +import com.xdadan.erp.emis.service.impl.EmisWaybillServiceImpl; import org.apache.ibatis.annotations.Param; /** @@ -75,6 +79,7 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper * @param emisTmsSiteBatch * @return */ + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass= EmisTmsSiteBatchServiceImpl.class) public int updateEmisTmsSiteBatch(EmisTmsSiteBatch emisTmsSiteBatch); /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java index d21412012..e21d319e2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchService.java @@ -10,6 +10,8 @@ package com.xdadan.erp.emis.service; import java.util.List; + +import com.xdadan.erp.common.core.audit.IDataAuditService; import com.xdadan.erp.emis.domain.EmisTmsSiteBatch; import com.xdadan.erp.emis.domain.EmisTmsSiteBatchDtl; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -20,7 +22,7 @@ import com.xdadan.erp.emis.domain.exception.EmisBizError; * @author linfso * @date 2024-03-01 08:54:56 */ -public interface IEmisTmsSiteBatchService +public interface IEmisTmsSiteBatchService extends IDataAuditService { /** * 主键查询 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index 9f2d1e11c..13a4720a4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -62,6 +62,17 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi @Autowired private EmisTransPlanRuleMapper emisTransPlanRuleMapper; + /** + * 获取稽核数据 + * @param id + * @return + */ + @Override + public Object getAuditObjectById(Object id) { + EmisTmsSiteBatch emisTmsSiteBatch = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchById((Long)id); + return emisTmsSiteBatch; + } + /** * 查询一级网点TMS组批次 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java index 6063b00c2..3f8f283ef 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransPlanRuleServiceImpl.java @@ -137,7 +137,7 @@ public class EmisTransPlanRuleServiceImpl extends EmisBaseService implements IEm */ @Override public List selectEmisTransPlanRuleTree(EmisTransPlanRule emisTransPlanRule) { - if(StringUtil.isBlank(emisTransPlanRule.getLineCode())||StringUtil.isBlank(emisTransPlanRule.getProductType())||StringUtil.isBlank(emisTransPlanRule.getStartSiteCode())){ + if(StringUtil.isBlank(emisTransPlanRule.getLineCode())||StringUtil.isBlank(emisTransPlanRule.getProductType())||StringUtil.isBlank((String) emisTransPlanRule.getParams().get("lineStartSiteCode"))){ return Lists.newArrayList(); } // 查询所有规则 diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 72344de63..c8d52cae1 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select m.id, m.bill_code, m.miss_reason, m.create_time, m.update_time, m.remark, m.del_flag, m.line_code, m.product_type, m.start_site_code, m.next_site_code, m.supplier_code, m.start_date, m.end_date,m.miss_type, - w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as dispatch_underling_site_name,w.bl_is_question, + w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code, @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_site s3 on m.next_site_code=s3.site_code and s3.del_flag=0 left join emis_country c1 on w.send_country=c1.code and c1.del_flag='0' left join emis_country c2 on w.receive_country=c2.code and c2.del_flag='0' - left join emis_destination n on w.dispatch_underling_site_code=n.dest_code and n.del_flag='0' + left join emis_site s4 on w.dispatch_underling_site_code=s4.site_code and s4.del_flag=0 left join emis_trans_line k on w.trans_line_type=k.line_code and k.del_flag='0' left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0' left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0' @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code, null as supplier_code, null as start_date, null as end_date, '0' as miss_type, w.send_site_code, s1.site_name as send_site_name, - w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as dispatch_underling_site_name, w.bl_is_question, + w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, @@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inner join emis_waybill w on b.bill_code = w.bill_code and w.del_flag='0' left join emis_site s1 on w.send_site_code=s1.site_code and s1.del_flag=0 left join emis_country c1 on w.send_country=c1.code and c1.del_flag=0 - left join emis_destination n on w.dispatch_underling_site_code=n.dest_code and n.del_flag=0 + left join emis_site s2 on w.dispatch_underling_site_code=s2.site_code and s2.del_flag=0 left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0 left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0 @@ -225,6 +225,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.miss_type = 1 + + AND m.bill_code IN ( + SELECT bill_code + FROM emis_tms_site_batch_miss + WHERE del_flag = '0' + GROUP BY bill_code + HAVING COUNT(*) > 9 + ) + AND m.bill_code IN ( SELECT bill_code diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml index ff594917b..5f9b39128 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s1.site_name as start_site_name, r.next_site_code, s2.site_name as next_site_name, r.manager, r.supplier_code, r.start_date, r.end_date, r.remark, r.del_flag, - l.line_name,l.trans_manager, l.from_country, l.country + l.line_name,l.trans_manager, l.from_country, l.country, (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) FROM emis_supplier s WHERE FIND_IN_SET(s.code, r.supplier_code)