栈板初始化

src/main/java/com/gaotao/modules/api/controller/IfsCallErrorLogController.java

@@ -124,4 +124,10 @@ public class IfsCallErrorLogController extends AbstractController {
             return R.error("重试失败：" + e.getMessage());
         }
     }
+    @PostMapping("/closeRetry")
+    public R closeRetry(@RequestBody IfsCallErrorLogData data) {
+        String processedBy = getUser().getUsername();
+        ifsCallErrorLogService.closeRetry(data.getId(), processedBy);
+       return R.ok();
+    }
 }

src/main/java/com/gaotao/modules/api/service/IfsCallErrorLogService.java

@@ -75,4 +75,6 @@ public interface IfsCallErrorLogService extends IService<IfsCallErrorLog> {
      * @date 2025/10/08
      */
     boolean retryIfsCall(Long id, String processedBy);
+
+    void closeRetry(Long id, String processedBy);
 }

src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java

@@ -259,6 +259,15 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
         }
     }
 
+    @Override
+    public void closeRetry(Long id, String processedBy){
+        IfsCallErrorLog errorLog = this.getById(id);
+        errorLog.setProcessStatus("IGNORED");
+        errorLog.setProcessedBy(processedBy);
+        errorLog.setProcessedAt(new Date());
+        this.updateById(errorLog);
+    }
+    
     /**
      * @Description 重试调用IFS接口（独立方法，复制自syncSingleGroupToIFSForPallet，不影响原有逻辑）- rqrq
      * @param errorLog 错误日志

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/InventoryDiscrepancyServiceImpl.java

@@ -36,6 +36,21 @@ public class InventoryDiscrepancyServiceImpl implements InventoryDiscrepancyServ
     @Autowired
     private WcsIntegrationMapper wcsIntegrationMapper;
     
+    /**
+     * @Description 位置信息内部类（用于自动分拣）- rqrq
+     */
+    private static class PositionInfo {
+        String position;
+        Integer layer;
+        String partNo;
+        
+        public PositionInfo(String position, Integer layer, String partNo) {
+            this.position = position;
+            this.layer = layer;
+            this.partNo = partNo;
+        }
+    }
+    
     /**
      * @Description 处理WCS回调扫描记录，对比库存差异 - rqrq
      * @Title processCallbackScan
@@ -52,7 +67,7 @@ public class InventoryDiscrepancyServiceImpl implements InventoryDiscrepancyServ
         try {
             // 1. 更新回调记录状态为处理中 - rqrq
             wcsCallbackPalletScanMapper.updateProcessStatus(callback.getId(), "PROCESSING", null);
-            
+            if(callback.getSoreType()==0) {
                 // 2. 从pallet_detail表查询WMS账面数据 - rqrq
                 List<PalletDetailData> wmsDetailList = wcsIntegrationMapper.getPalletDetailsData(
                         callback.getSite(), callback.getPalletId());
@@ -131,6 +146,160 @@ public class InventoryDiscrepancyServiceImpl implements InventoryDiscrepancyServ
 
                 System.out.println("WCS回调扫描记录对账完成 - rqrq，palletId=" + callback.getPalletId()
                         + "，分拣方式=" + callback.getSoreType());
+            } else if(callback.getSoreType()==1||callback.getSoreType()==2) {
+                // 自动分拣逻辑（气胀轴或抱箱）- rqrq
+                System.out.println("执行自动分拣逻辑 - rqrq，分拣方式=" + (callback.getSoreType()==1 ? "气胀轴" : "抱箱"));
+                
+                // 1. 解析jsonStr为PushPalletDetailDto对象 - rqrq
+                if (!StringUtils.hasText(callback.getJsonStr())) {
+                    throw new Exception("jsonStr为空，无法解析栈板和明细信息");
+                }
+                
+                com.gaotao.modules.api.entity.PushPalletDetailDto pushData = JSONObject.parseObject(
+                    callback.getJsonStr(), 
+                    com.gaotao.modules.api.entity.PushPalletDetailDto.class
+                );
+                
+                if (pushData == null) {
+                    throw new Exception("jsonStr解析为PushPalletDetailDto失败");
+                }
+                
+                String originalPalletId = pushData.getPalletBarcode();
+                if (!StringUtils.hasText(originalPalletId)) {
+                    throw new Exception("PushPalletDetailDto中未找到栈板编码(palletBarcode)");
+                }
+                
+                System.out.println("解析成功 - rqrq，原栈板=" + originalPalletId 
+                    + "，taskNo=" + pushData.getTaskNo() 
+                    + "，itemNo=" + pushData.getItemNo());
+                
+                // 2. 查询原栈板的pallet_detail数据（WMS账面）- rqrq
+                List<PalletDetailData> wmsDetailList = wcsIntegrationMapper.getPalletDetailsData(
+                    callback.getSite(), originalPalletId);
+                
+                // 提取WMS所有条码（当前账面）- rqrq
+                Set<String> wmsSerialNoSet = wmsDetailList.stream()
+                    .map(PalletDetailData::getSerialNo)
+                    .collect(Collectors.toSet());
+                
+                System.out.println("WMS当前明细数量 - rqrq：" + wmsDetailList.size() + "条");
+                
+                // 3. 提取WCS回传的所有条码和位置信息 - rqrq
+                Map<String, PositionInfo> wcsSerialNoMap = new HashMap<>();
+                int totalWcsCount = 0;
+                
+                List<com.gaotao.modules.api.entity.PalletStationVo> cargoInfos = pushData.getCargoInfos();
+                if (cargoInfos != null && !cargoInfos.isEmpty()) {
+                    for (com.gaotao.modules.api.entity.PalletStationVo cargoInfo : cargoInfos) {
+                        Integer position = cargoInfo.getPosition();
+                        Integer layer = cargoInfo.getLayer();
+                        List<com.gaotao.modules.api.entity.PalletStationDetailVo> productInfos = cargoInfo.getProductInfos();
+                        
+                        if (productInfos != null && !productInfos.isEmpty()) {
+                            for (com.gaotao.modules.api.entity.PalletStationDetailVo product : productInfos) {
+                                totalWcsCount++;
+                                String serialNo = product.getSerialNo();
+                                wcsSerialNoMap.put(serialNo, new PositionInfo(
+                                    String.valueOf(position), 
+                                    layer, 
+                                    product.getSku()
+                                ));
+                            }
+                        }
+                    }
+                }
+                
+                System.out.println("WCS回传明细总数 - rqrq：" + totalWcsCount + "条");
+                
+                // 4. 找出被拿走的物料（WMS有但WCS没有的）- rqrq
+                Set<String> removedSerialNos = new HashSet<>(wmsSerialNoSet);
+                removedSerialNos.removeAll(wcsSerialNoMap.keySet());
+                
+                System.out.println("被拿走的物料数量 - rqrq：" + removedSerialNos.size() + "条");
+                
+                // 5. 将拿走的物料转移到虚拟栈板"ZIDONGFENJIAN" - rqrq
+                String virtualPalletId = "ZIDONGFENJIAN";
+                String virtualPosition = pushData.getTaskNo();  // position = taskNo
+                Integer virtualLayer = pushData.getItemNo();    // layer = itemNo
+                String username = "WCS";
+                
+                for (String removedSerialNo : removedSerialNos) {
+                    // 查找原明细信息（获取partNo）- rqrq
+                    PalletDetailData originalDetail = wmsDetailList.stream()
+                        .filter(d -> removedSerialNo.equals(d.getSerialNo()))
+                        .findFirst()
+                        .orElse(null);
+                    
+                    if (originalDetail == null) {
+                        System.err.println("未找到原明细信息 - rqrq：serialNo=" + removedSerialNo);
+                        continue;
+                    }
+                    
+                    // 从原栈板删除 - rqrq
+                    wcsIntegrationMapper.deletePalletDetailBySerialNo(callback.getSite(), removedSerialNo);
+                    
+                    // 添加到虚拟栈板 - rqrq
+                    wcsIntegrationMapper.savePalletDetailNoValidation(
+                        callback.getSite(), 
+                        virtualPalletId, 
+                        virtualPosition, 
+                        virtualLayer, 
+                        removedSerialNo, 
+                        originalDetail.getPartNo(), 
+                        username, 
+                        1  // wcsFlag=1（待推送）
+                    );
+                    
+                    System.out.println("物料已转移到虚拟栈板 - rqrq：serialNo=" + removedSerialNo 
+                        + "，虚拟栈板=" + virtualPalletId 
+                        + "，position=" + virtualPosition 
+                        + "，layer=" + virtualLayer);
+                }
+                
+                // 6. 更新还在原栈板上的物料的position和layer - rqrq
+                Set<String> remainingSerialNos = new HashSet<>(wmsSerialNoSet);
+                remainingSerialNos.retainAll(wcsSerialNoMap.keySet());  // WMS和WCS都有的
+                
+                System.out.println("还在原栈板上的物料数量 - rqrq：" + remainingSerialNos.size() + "条，开始更新位置");
+                
+                for (String remainingSerialNo : remainingSerialNos) {
+                    PositionInfo newPosInfo = wcsSerialNoMap.get(remainingSerialNo);
+                    
+                    // 更新位置和层数 - rqrq
+                    wcsIntegrationMapper.updatePalletDetailPosition(
+                        callback.getSite(), 
+                        originalPalletId, 
+                        remainingSerialNo, 
+                        newPosInfo.position, 
+                        newPosInfo.layer,
+                            "JiXieShouBi"
+                    );
+                    
+                    System.out.println("更新物料位置 - rqrq：serialNo=" + remainingSerialNo 
+                        + "，newPosition=" + newPosInfo.position 
+                        + "，newLayer=" + newPosInfo.layer);
+                }
+                
+                // 7. 更新空栈板标记（如果原栈板已无明细，则标记为空）- rqrq
+                if (remainingSerialNos.isEmpty()) {
+                    wcsIntegrationMapper.updatePalletEmptyFlag(callback.getSite(), originalPalletId, "Y", username);
+                    System.out.println("原栈板已空，更新empty_flag='Y' - rqrq");
+                } else {
+                    wcsIntegrationMapper.updatePalletEmptyFlag(callback.getSite(), originalPalletId, "N", username);
+                    System.out.println("原栈板非空，更新empty_flag='N' - rqrq");
+                }
+                
+                // 8. 更新回调记录状态为已完成 - rqrq
+                wcsCallbackPalletScanMapper.updateProcessStatus(
+                    callback.getId(), 
+                    "COMPLETED", 
+                    "自动分拣处理完成，转移" + removedSerialNos.size() + "条，更新" + remainingSerialNos.size() + "条"
+                );
+                
+                System.out.println("自动分拣处理完成 - rqrq，原栈板=" + originalPalletId 
+                    + "，转移到虚拟栈板=" + removedSerialNos.size() + "条"
+                    + "，更新位置=" + remainingSerialNos.size() + "条");
+            }
             
         } catch (Exception e) {
             System.err.println("处理WCS回调扫描记录对账失败 - rqrq，palletId=" + callback.getPalletId()