From 7e02541301410ed56d9f331896e5895298b5c3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 1 Dec 2025 13:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E9=80=89=E7=A7=BB=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WcsIntegrationServiceImpl.java       | 51 ++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 5e483d2..d61c6dd 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -2631,15 +2631,16 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         log.info("获取栈板当前所在站点 - rqrq，fromLocation={}", fromLocation);
         List<PalletDetailData> palletDetails = wcsIntegrationMapper.getPalletDetailsData(site, palletId);
 
-        PalletType palletType = wcsIntegrationMapper.getPalletTypeInfoByPallet(site,palletId);
-        UpdateStationToWcs updateStationToWcs = new UpdateStationToWcs();
-        updateStationToWcs.setPalletizingPosition(currentStation.getStationCode());
-        updateStationToWcs.setPalletCode(palletId);
-        updateStationToWcs.setOperationType(1);
-        updateStationToWcs.setPalletType(palletType.getWcsPalletType());
-        updateStationToWcs.setBasePalletType(palletType.getWcsBasePalletType());
-        updateStationToWcs.setWcsTaskId("0");
-        wcsApiService.updateStationToWcs(updateStationToWcs);
+        // PalletType palletType = wcsIntegrationMapper.getPalletTypeInfoByPallet(site,palletId);
+        // UpdateStationToWcs updateStationToWcs = new UpdateStationToWcs();
+        // updateStationToWcs.setPalletizingPosition(currentStation.getStationCode());
+        // updateStationToWcs.setPalletCode(palletId);
+        // updateStationToWcs.setOperationType(1);
+        // updateStationToWcs.setPalletType(palletType.getWcsPalletType());
+        // updateStationToWcs.setBasePalletType(palletType.getWcsBasePalletType());
+        // updateStationToWcs.setWcsTaskId("0");
+        // wcsApiService.updateStationToWcs(updateStationToWcs);
+
 
         if (palletDetails != null && !palletDetails.isEmpty()) {
             Map<String, Object> toStationInfo = getStationInfo("FenJian");
@@ -2660,15 +2661,39 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             wmsMessageService.doWareHouseForPallet(transferRequest);
         }
         // 更新pallet_detail的wcs_flag为1 - rqrq
-        wcsIntegrationMapper.updateAllPalletDetailWcsFlagToOne(site, palletId);
+        // wcsIntegrationMapper.updateAllPalletDetailWcsFlagToOne(site, palletId);
 
         wcsIntegrationMapper.updatePalletCallingFlag(site, palletId, "N", null, username);
         palletOperationLogService.logPalletOperation(palletId, site,"调用托盘","结束分拣","是否调用","Y","N",username,"");
 
-        wcsIntegrationMapper.updateAgvStationStatus("FenJian", 1, "有货");
-        wcsIntegrationMapper.updateAgvStationStatus(currentStation.getStationCode(), 0, "空闲");
-        palletMapper.updateLocationWithPalletId(site, palletId,"FenJian", null);
+        // wcsIntegrationMapper.updateAgvStationStatus("FenJian", 1, "有货");
+        // wcsIntegrationMapper.updateAgvStationStatus(currentStation.getStationCode(), 0, "空闲");
+        // palletMapper.updateLocationWithPalletId(site, palletId,"FenJian", null);
+        // 循环记录每个标签的移出操作日志 - rqrq
+        for (PalletDetailData detail : palletDetails) {
+            try {
+                handlingUnitOperationLogService.logHandlingUnitOperation(
+                        site,                      // 站点
+                        detail.getSerialNo(),      // 条码号
+                        "扫出",                  // 操作类型
+                        "一键移出物料",             // 操作原因
+                        "所在栈板",               // 字段名
+                        palletId,                  // 旧值（原栈板ID）
+                        "",                        // 新值（空，表示已移出）
+                        username,                  // 操作者
+                        null                       // 任务号
+                );
+            } catch (Exception e) {
+                System.err.println("记录标签移出日志失败 - rqrq，serialNo=" + detail.getSerialNo() + "，错误：" + e.getMessage());
+                // 日志记录失败不影响主流程，继续执行
+            }
+        }
+        System.out.println("移出日志记录完成 - rqrq");
 
+        // 删除所有明细 - rqrq
+        wcsIntegrationMapper.deleteAllPalletDetail(site, palletId);
+        updatePalletEmptyFlag(site, palletId, username);
+        System.out.println("已删除所有栈板明细 - rqrq");
 
         //要给wcs回传货位信息
         log.info("结束分拣完成 - rqrq");