From e2e6b78e5c87e742dd73f40eab72d48d5e3c2324 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 14:46:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=20=E6=96=B0=E5=A2=9E=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=80=E7=BA=A7=E7=BD=91=E7=82=B9TMS=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=88=E4=B8=80=E4=B8=AA=E6=8E=A5=E5=8F=A3=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=89=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/emis/EmisTmsSiteBatchController.java  | 10 ++++++
 .../mapper/EmisTmsSiteBatchLoadingMapper.java | 11 ++++++-
 .../emis/mapper/EmisTmsSiteBatchMapper.java   |  7 +++++
 .../service/IEmisTmsSiteBatchService.java     |  7 +++++
 .../impl/EmisTmsSiteBatchServiceImpl.java     |  5 +++
 .../mapper/EmisTmsSiteBatchLoadingMapper.xml  |  6 ++++
 .../mapper/EmisTmsSiteBatchMapper.xml         | 31 +++++++++++++++++++
 7 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
index 462686cd0..b83aa5f4e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
@@ -169,6 +169,16 @@ public class EmisTmsSiteBatchController extends EmisBaseController
         return AjaxResult.success(emisTmsSiteBatchService.selectEmisTmsSiteBatchById(id));
     }
 
+    /**
+     * 获取一级网点TMS组批次详细信息（一个接口实现）
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:detail')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult geDetail(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisTmsSiteBatchService.geDetail(id));
+    }
+
     /**
      * 新增一级网点TMS组批次
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java
index 239252442..bee952547 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchLoadingMapper.java
@@ -34,7 +34,16 @@ public interface EmisTmsSiteBatchLoadingMapper extends BaseMapper<EmisTmsSiteBat
      * @param emisTmsSiteBatchLoading 
      * @return 集合
      */
-    public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingList(EmisTmsSiteBatchLoading emisTmsSiteBatchLoading);
+    public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingList(
+            EmisTmsSiteBatchLoading emisTmsSiteBatchLoading);
+
+    /**
+     * 根据批次号查询装载信息列表
+     * 
+     * @param batchNo 批次号
+     * @return 集合
+     */
+    public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingByBatchNo(String batchNo);
 
     /**
      * 新增 
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 fd9687418..104f8cbfd 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
@@ -31,6 +31,13 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
      */
     public EmisTmsSiteBatch selectEmisTmsSiteBatchById(Long id);
 
+    /**
+     * 主键查询（包含明细和装载信息）
+     * 
+     * @param id
+     * @return
+     */
+    public EmisTmsSiteBatch selectEmisTmsSiteBatchWithDetailsById(Long id);
 
     public EmisTmsSiteBatch selectTmsSiteBatchByBatchNo(String batchNo);
 
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 946b29d4e..0a564974e 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
@@ -105,4 +105,11 @@ public interface IEmisTmsSiteBatchService
   * @return
   */
  int addAll(EmisTmsSiteBatch emisTmsSiteBatch) throws EmisBizError;
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    public EmisTmsSiteBatch geDetail(Long id);
 }
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 042bfeab9..b57996409 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
@@ -243,4 +243,9 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
         return 1;
     }
 
+    @Override
+    public EmisTmsSiteBatch geDetail(Long id) {
+        return emisTmsSiteBatchMapper.selectEmisTmsSiteBatchWithDetailsById(id);
+    }
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
index 34f9d16d5..63710b54b 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
@@ -42,6 +42,12 @@
         order by create_time desc
     </select>
 
+    <select id="selectEmisTmsSiteBatchLoadingByBatchNo" parameterType="String" resultMap="EmisTmsSiteBatchLoadingResult">
+        <include refid="selectEmisTmsSiteBatchLoadingVo"/>
+        where del_flag='0' and batch_no = #{batchNo}
+        order by create_time desc
+    </select>
+
     <select id="checkUnique" parameterType="EmisTmsSiteBatchLoading"  resultType="int">
 		select count(1) from  emis_tms_site_batch_loading
 		where del_flag='0'
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 547d11072..b0c596ef9 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -103,6 +103,31 @@
         </collection>
     </resultMap>
 
+    <resultMap type="EmisTmsSiteBatch" id="EmisTmsSiteBatchWithDetailsResult" extends="EmisTmsSiteBatchResult">
+        <!-- 批次明细列表 -->
+        <collection property="batchDtlList" ofType="EmisTmsSiteBatchDtl" select="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper.selectEmisTmsSiteBatchDtlByBatchNo" column="batch_no">
+            <result property="id" column="id"/>
+            <result property="billCode" column="bill_code"/>
+            <result property="batchNo" column="batch_no"/>
+            <result property="scanDate" column="scan_date"/>
+            <result property="scanStatus" column="scan_status"/>
+            <result property="groupStatus" column="group_status"/>
+            <result property="scanMan" column="scan_man"/>
+            <result property="scanSite" column="scan_site"/>
+            <association property="waybillDetail" column="bill_code" select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"/>
+        </collection>
+        <!-- 装载信息列表 -->
+        <collection property="loadingList" ofType="EmisTmsSiteBatchLoading" select="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper.selectEmisTmsSiteBatchLoadingByBatchNo" column="batch_no">
+            <result property="id" column="id"/>
+            <result property="batchNo" column="batch_no"/>
+            <result property="posNo" column="pos_no"/>
+            <result property="row" column="row"/>
+            <result property="col" column="col"/>
+            <result property="layer" column="layer"/>
+            <result property="posDesc" column="pos_desc"/>
+        </collection>
+    </resultMap>
+
     <sql id="selectEmisTmsSiteBatchVo">
         select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch
     </sql>
@@ -323,6 +348,12 @@
         where a.id = #{id}
     </select>
 
+    <select id="selectEmisTmsSiteBatchWithDetailsById" parameterType="Long" resultMap="EmisTmsSiteBatchWithDetailsResult">
+        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering
+        from emis_tms_site_batch a
+        where a.id = #{id}
+    </select>
+
     <select id="selectTmsSiteBatchBySupplerAndCarNo" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
         select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_site_batch a

From ed5eea160e095656f5039598cdf05ca9d898249c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 17:27:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=87=8D=E6=9E=84=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=99=E6=B8=AF-=E7=BC=85=E7=94=B8?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=80=BB=E8=BE=91=E3=80=82=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/EmisBaseService.java     | 50 ++++++++++++++++---
 .../impl/EmisTmsSiteBatchServiceImpl.java     |  2 +-
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 9752c1d6d..c8fe54284 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -2844,7 +2844,7 @@ public class EmisBaseService {
              }
          }
 
-         if ("002".equals(waybill.getTransLineType()) && StringUtil.isNotBlank(waybill.getVirtualRemark())) {
+         if (("078".equals(waybill.getTransLineType()) || "002".equals(waybill.getTransLineType())) && StringUtil.isNotBlank(waybill.getVirtualRemark())) {
              Date sendDate = waybill.getSendDate();
              SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
              Date limitDate = null;
@@ -4026,9 +4026,47 @@ public class EmisBaseService {
                  continue;
              }
 
-             // 按productType分组
-             Map<String, List<EmisTransPlanRule>> groupByProductType = lineRules.stream()
-                     .collect(Collectors.groupingBy(EmisTransPlanRule::getProductType));
+             // 按productType分组（支持productType和productTypeName为逗号分隔的多个类型，且一一对应，且每个rule只保留一个type和typeName）
+             Map<String, List<EmisTransPlanRule>> groupByProductType = new HashMap<>();
+             for (EmisTransPlanRule rule : lineRules) {
+                 if (rule.getProductType() != null) {
+                     String[] types = rule.getProductType().split(",");
+                     String[] typeNames = rule.getProductTypeName() != null ? rule.getProductTypeName().split(",") : new String[0];
+                     for (int i = 0; i < types.length; i++) {
+                         String type = types[i].trim();
+                         if (!type.isEmpty()) {
+                             EmisTransPlanRule newRule = new EmisTransPlanRule();
+                             BeanUtils.copyProperties(rule, newRule);
+                             newRule.setProductType(type);
+                             if (i < typeNames.length) {
+                                 newRule.setProductTypeName(typeNames[i].trim());
+                             } else {
+                                 newRule.setProductTypeName(null);
+                             }
+                             groupByProductType.computeIfAbsent(type, k -> new ArrayList<>()).add(newRule);
+                         }
+                     }
+                 }
+             }
+             // 分组内去重（lineCode、productType、startSiteCode、nextSiteCode、supplierCode、startDate、endDate都相同只保留一条）
+             for (Map.Entry<String, List<EmisTransPlanRule>> entry : groupByProductType.entrySet()) {
+                 List<EmisTransPlanRule> rules = entry.getValue();
+                 Set<String> uniqueKeys = new HashSet<>();
+                 List<EmisTransPlanRule> deduped = new ArrayList<>();
+                 for (EmisTransPlanRule rule : rules) {
+                     String key = (rule.getLineCode() == null ? "" : rule.getLineCode()) + "|"
+                             + (rule.getProductType() == null ? "" : rule.getProductType()) + "|"
+                             + (rule.getStartSiteCode() == null ? "" : rule.getStartSiteCode()) + "|"
+                             + (rule.getNextSiteCode() == null ? "" : rule.getNextSiteCode()) + "|"
+                             + (rule.getSupplierCode() == null ? "" : rule.getSupplierCode()) + "|"
+                             + (rule.getStartDate() == null ? "" : rule.getStartDate().toString()) + "|"
+                             + (rule.getEndDate() == null ? "" : rule.getEndDate().toString());
+                     if (uniqueKeys.add(key)) {
+                         deduped.add(rule);
+                     }
+                 }
+                 entry.setValue(deduped);
+             }
 
              // 处理每个productType分组
              for (Map.Entry<String, List<EmisTransPlanRule>> productEntry : groupByProductType.entrySet()) {
@@ -4840,7 +4878,7 @@ public class EmisBaseService {
 
          Map<String, Object> scanDatePromItem = new HashMap<>();
          scanDatePromItem.put("billCode", emisWaybillSave.getBillCode());
-         if ("002".equals(emisWaybillSave.getTransLineType())) {
+         if ("078".equals(emisWaybillSave.getTransLineType()) || "002".equals(emisWaybillSave.getTransLineType())) {
              scanDatePromItem.put("problemType", "173");
              scanDatePromItem.put("remark", "出口虚拟面单");
          } else {
@@ -4891,7 +4929,7 @@ public class EmisBaseService {
          if (emisWaybillSave.getMasterBillCode().equals(emisWaybillSave.getBillCode())) {
              throw new EmisBizError(EmisBizErrorType.FAIL, "运单号主单号不能相同");
          }
-         if (!"002".equals(emisWaybillSave.getTransLineType()) && !"012".equals(emisWaybillSave.getTransLineType())
+         if (!"078".equals(emisWaybillSave.getTransLineType()) && !"002".equals(emisWaybillSave.getTransLineType()) && !"012".equals(emisWaybillSave.getTransLineType())
                  && !"014".equals(emisWaybillSave.getTransLineType())) {
              throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为缅甸快递/缅甸快递进口/柬埔寨快递进口");
          }
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 b57996409..1a3132002 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
@@ -150,7 +150,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
         emisTransPlanRule.setProductType(emisWaybill.getProductType());
         List<EmisTransPlanRule> list = emisTransPlanRuleMapper.checkTransPlanRule(emisTransPlanRule);
         if (CollectionUtil.isEmpty(list)) {
-            throw new EmisBizError(EmisBizErrorType.FAIL, "组批次起始网点、下一网点、供应商与规则不匹配");
+            throw new EmisBizError(EmisBizErrorType.FAIL, emisWaybill.getBillCode()+"组批次起始网点、下一网点、供应商与规则不匹配");
         }
     }
 

From 7a8c1f77a3004564ea93ac2de9b5df135680c920 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 17:38:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=87=8D=E6=9E=84=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=99=E6=B8=AF-=E7=BC=85=E7=94=B8?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=80=BB=E8=BE=91=E3=80=82=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index c8fe54284..d99439c56 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -4929,9 +4929,13 @@ public class EmisBaseService {
          if (emisWaybillSave.getMasterBillCode().equals(emisWaybillSave.getBillCode())) {
              throw new EmisBizError(EmisBizErrorType.FAIL, "运单号主单号不能相同");
          }
-         if (!"078".equals(emisWaybillSave.getTransLineType()) && !"002".equals(emisWaybillSave.getTransLineType()) && !"012".equals(emisWaybillSave.getTransLineType())
-                 && !"014".equals(emisWaybillSave.getTransLineType())) {
-             throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为缅甸快递/缅甸快递进口/柬埔寨快递进口");
+         Set<String> allowedTypes = new HashSet<>();
+         allowedTypes.add("078");
+         allowedTypes.add("002");
+         allowedTypes.add("012");
+         allowedTypes.add("014");
+         if (!allowedTypes.contains(emisWaybillSave.getTransLineType())) {
+             throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为香港-缅甸快递/缅甸快递/缅甸快递进口/柬埔寨快递进口");
          }
          EmisWaybill masterWaybill = emisWaybillMapper
                  .selectMasterWaybillByBillCode(emisWaybillSave.getMasterBillCode());