From eb64a352d245528e68bb2f00f4e9349753b75703 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 11 Jul 2024 16:50:38 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 96852b82c..b9a1c74df 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -694,13 +694,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             // 如果是缅甸允许主单扫描,其他都不允许
             if("0095".equals(emisWaybill.getReceiveCountry())  ){
                 // 缅甸只允许主单
-                if ( !mainBillCode.equals(scanBillCode) ) {
-                    scanResultItem.setResult("fail");
-                    scanResultItem.setMessage("缅甸只允许主单");
-                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
-                    itemList.add(scanResultItem);
-                    return itemList;
-                }
+//                if ( !mainBillCode.equals(scanBillCode) ) {
+//                    scanResultItem.setResult("fail");
+//                    scanResultItem.setMessage("缅甸只允许主单");
+//                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+//                    itemList.add(scanResultItem);
+//                    return itemList;
+//                }
             }else{
                 if ( mainBillCode.equals(scanBillCode) ) {
                     scanResultItem.setResult("fail");
@@ -893,6 +893,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         boolean blUnPack=false;
         Map countryMap = new HashMap();
 
+        String destCountry=null;
+
         // 子单号处理
         for (String scanBillCode : billCodeArr) {
             // 返回原始数据返回
@@ -995,6 +997,19 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 }
             }
 
+            if(destCountry==null){
+                destCountry=emisWaybill.getReceiveCountry();
+            }
+            else{
+                // 不允许有不同国家的货混装
+                if( !destCountry.equals(emisWaybill.getReceiveCountry()) ){
+                    scanResultItem.setResult("fail");
+                    scanResultItem.setMessage("不同国家的货不允许混装");
+                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+                    itemList.add(scanResultItem);
+                    return itemList;
+                }
+            }
 
             // 记录总票数
             if(!mainBillMap.containsKey(mainBillCode)){