报文

src/main/java/com/gaotao/modules/autoWareHourceHaian/api/service/impl/HaiAnWcsApiServiceImpl.java

@@ -99,7 +99,7 @@ public class HaiAnWcsApiServiceImpl implements HaiAnWcsApiService {
 
     /**
      * @author rqrq
-     * @Description 组盘增量数据推送，发送前校验必填type，按老接口风格记录调用日志并检查resCode=200 - rqrq
+     * @Description 组盘增量数据推送，发送前校验必填type。接口日志业务主键取报文托盘码 palletBarcode，再检查resCode=200 - rqrq
      */
     @Override
     public String pushZuPanApi(HaiAnAssemblePalletRequest inData) {
@@ -123,12 +123,15 @@ public class HaiAnWcsApiServiceImpl implements HaiAnWcsApiService {
         String url = haianWcsUrl + "assemble-pallet";
         String requestJson = JSONObject.toJSONString(request);
         try {
+            // 组盘增量的托盘码在报文 palletBarcode，写入接口日志业务主键；没有托盘码时留空，不拿任务号顶上 - rqrq
+            String palletBarcode = inData != null && StringUtils.hasText(inData.getPalletBarcode())
+                    ? inData.getPalletBarcode().trim() : null;
             logId = haiAnInterfaceCallLogService.haiAnLogInterfaceCall(
                     "PushPalletDetailNew",
                     "组盘增量数据",
                     requestJson,
                     inData.getSite(),
-                    null,
+                    palletBarcode,
                     "组盘增量数据"
             );
             ObjectMapper objectMapper = new ObjectMapper();

src/main/java/com/gaotao/modules/autoWareHourceHaian/api/service/impl/HaiAnWmsMessageServiceImpl.java

@@ -1571,7 +1571,7 @@ public class HaiAnWmsMessageServiceImpl implements HaiAnWmsMessageService {
 
     /**
      * @author rqrq
-     * @Description 处理AGV任务反馈：只写任务明细并按动作幂等去重；targetArea可映射时存业务area_id，缺少映射时保留WCS原码供后续消费重试，避免丢失回调 - rqrq
+     * @Description 处理AGV任务反馈：只写任务明细并按动作幂等去重。接口日志业务主键用托盘号。targetArea可映射时存业务area_id，缺少映射时保留WCS原码供后续消费重试，避免丢失回调 - rqrq
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -1582,12 +1582,14 @@ public class HaiAnWmsMessageServiceImpl implements HaiAnWmsMessageService {
         String businessKey = data == null ? null : normalizeText(data.getWmsId());
         String requestJson = JSONObject.toJSONString(data);
         try {
+            // 接口日志业务主键用托盘号：palletId 优先，没有再取 pallet。任务号 wmsId 仍留给后面的异常日志 - rqrq
+            String palletBusinessKey = data == null ? null : data.resolvePalletId();
             logId = haiAnInterfaceCallLogService.haiAnLogInterfaceCall(
                     "HaiAnWmsMessageService",
                     "handleAgvCallback",
                     requestJson,
                     site,
-                    businessKey,
+                    palletBusinessKey,
                     "海安AGV任务反馈"
             );
             String messageId = generateMessageId("HAIAN_AGV_FB");