From fa5897f7956bfd174f3354e44818fe2d580b79e4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 11 Jul 2024 05:22:07 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 70 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 3 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 6bb15e57f..7e59e292d 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
@@ -244,14 +244,78 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                     continue;
                 }
 
+                // 到件扫描/报关扫描/清关扫描/发件扫描 - 需要支持扫描 合包条码
+                if(
+                        scanType.equals(ScanType.ARRIVAL.opCode)
+                                ||  scanType.equals(ScanType.DEPARTURE.opCode)
+                                ||  scanType.equals(ScanType.CLEARANCE.opCode)
+                                ||  scanType.equals(ScanType.DECLEARE.opCode) ){
+                    if(scanBillCode.startsWith("H")){
+                        // 判断是否是合包号
+                        EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode);
+                        if(emisTmsPack!=null) {
+
+
+                            if(emisTmsPack.getPackStatus().equals("2")){
+                                ScanResultItem scanResultItem = new ScanResultItem();
+                                scanResultItem.setBillCode(scanBillCode);
+                                scanResultItem.setResult("fail");
+                                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+                                scanResultItem.setMessage("已拆包，不允许扫描");
+                                itemList.add(scanResultItem);
+                                return itemList;
+                            }
+
+
+                            if(!emisTmsPack.getPackStatus().equals("1")){
+                                ScanResultItem scanResultItem = new ScanResultItem();
+                                scanResultItem.setBillCode(scanBillCode);
+                                scanResultItem.setResult("fail");
+                                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+                                scanResultItem.setMessage("未合包，不允许扫描");
+                                itemList.add(scanResultItem);
+                                return itemList;
+                            }
+
+                            // 合包发件扫描
+                            if( scanType.equals(ScanType.DEPARTURE.opCode)
+                                    ||  scanType.equals(ScanType.CLEARANCE.opCode)
+                                    ||  scanType.equals(ScanType.DECLEARE.opCode)
+                            )
+                            {
+
+                                // 货物不在当前网点不允许扫描
+                                if(!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())){
+                                    ScanResultItem scanResultItem = new ScanResultItem();
+                                    scanResultItem.setBillCode(scanBillCode);
+                                    scanResultItem.setResult("fail");
+                                    scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
+                                    scanResultItem.setMessage("合包不在当前网点");
+                                    itemList.add(scanResultItem);
+                                    return itemList;
+                                }
+
+                            }
+
+                            // 原始数据返回
+                            ScanResultItem scanResultItem = new ScanResultItem();
+                            scanResultItem.setBillCode(scanBillCode);
+                            scanResultItem.getData().putAll(scanDataItem);
+                            scanResultItem.setErrorCode(EmisBizErrorType.SUCCESS.errorCode);
+                            scanResultItem.setResult("success");
+                            scanResultItem.setMessage("允许操作");
+                            itemList.add(scanResultItem);
+                            return itemList;
+
+                        }
+                    }
+                }
+
                 // 原始数据返回
                 ScanResultItem scanResultItem = new ScanResultItem();
                 scanResultItem.setBillCode(scanBillCode);
                 scanResultItem.getData().putAll(scanDataItem);
 
-                // 判断是否是合包
-
-
                 // 获取主单号
                 String mainBillCode = getMainBillCode(scanBillCode);