feat(ttxofs): 新增入库确认单接口并优化错误处理- 新增入库确认单接口，支持查询入库确认信息

-优化错误处理逻辑，适应OFS系统返回的特殊情况
- 添加新接口对应的DTO类和缓存配置
- 注释掉测试代码以避免误用

service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java

@@ -70,7 +70,7 @@ public class DeleteU8cDataUtil {
                         //取消签字销售出库单 已测试
 //                        cancelSignatureIcGeneralHV2("'0001A110000000001TH6', '0001A1100000000VKCOK'");
                         //销售出库单签字 已测试
-                        saleOutSign("'0001A110000000001TH6', '0001A1100000000VKCOK'");
+//                        saleOutSign("'0001A110000000001TH6', '0001A1100000000VKCOK'");
                     }
                 }
             }

service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java

@@ -5,7 +5,6 @@ import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUClassSearchResponse;
 import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUSearchResponse;
 import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsShopReturnMessageDto;
 import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsSupplierReturnMessageDto;
-import com.hzya.frame.ttxofs.dto.ofsReceiptConfirmSearch.OFSReceiptConfirmSearchResponse;
 import com.hzya.frame.ttxofs.dto.ofsTransferOrderSearch.OFSAdjustOrderSearchResponse;
 import com.hzya.frame.ttxofs.dto.ofsTransferOrderSearch.OFSTranseferOrderSearchResponse;
 import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderBean;
@@ -53,5 +52,7 @@ public class ApiDtoCacheMap {
         apiDtoCacheMap.put("ofs.adjustOrder.search", new OFSAdjustOrderSearchResponse());//调整单
 
         apiDtoCacheMap.put("ofs.receipt.confirm.search", new OFSReceiptConfirmSearchResponse());//调整单
+
+        apiDtoCacheMap.put("ofs.receipt.confirm.search", new OfsWareConfirmaResponse());//入库确认单
     }
 }

service/src/main/java/com/hzya/frame/ttxofs/dto/InterfaceParamDto.java

@@ -18,15 +18,19 @@ public class InterfaceParamDto extends InterfaceBasics {
 
     private String format = "json";
 
-//    private String appKey = "1023142858";
+    //OFS正式
-    private String appKey = "2097046829";
+    private String appKey = "1023142858";
+    //OFS测试
+//    private String appKey = "2097046829";
 
     private String v = "1.0";
 
     private String sign;
 
-//    private String secret = "382e4a2584027a36ac9431103";
+    //OFS正式
-    private String secret = "35282f251476a3af4f00c7b36";
+    private String secret = "382e4a2584027a36ac9431103";
+    //OFS测试
+//    private String secret = "35282f251476a3af4f00c7b36";
 
     private String timestamp;
 

service/src/main/java/com/hzya/frame/ttxofs/dto/ofswareconfirma/OfsWareConfirmaData.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.ttxofs.dto.ofswareconfirma;
+
+import com.hzya.frame.ttxofs.basics.ReturnMessageBasics;
+
+import java.util.List;
+
+/**
+ * Auto-generated: 2025-03-10 10:25:41
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class OfsWareConfirmaData {
+
+    private OfsWareConfirmaHeader header;
+    private List<OfsWareConfirmaDetails> details;
+
+    public void setHeader(OfsWareConfirmaHeader header) {
+        this.header = header;
+    }
+
+    public OfsWareConfirmaHeader getHeader() {
+        return header;
+    }
+
+    public void setDetails(List<OfsWareConfirmaDetails> details) {
+        this.details = details;
+    }
+
+    public List<OfsWareConfirmaDetails> getDetails() {
+        return details;
+    }
+
+}

service/src/main/java/com/hzya/frame/ttxofs/dto/ofswareconfirma/OfsWareConfirmaDetails.java

@@ -0,0 +1,226 @@
+package com.hzya.frame.ttxofs.dto.ofswareconfirma;
+
+/**
+ * Auto-generated: 2025-03-10 10:25:41
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class OfsWareConfirmaDetails {
+    private String id;
+    private String receiptId;
+    private String receiptCode;
+    private String receiptConfirmId;
+    private String receiptConfirmCode;
+    private String refOrderId;
+    private String refOrderDetailId;
+    private String clientCode;
+    private String companyCode;
+    private String facilityCode;
+    private String skuCode;
+    private String skuName;
+    private String receivedQty;
+    private String quantityUM;
+    private String totalWeight;
+    private String totalVolume;
+    private String totalVolumeWeight;
+    private String weightUM;
+    private String volumeUM;
+    private String inventorySts;
+    private String created;
+    private String createdBy;
+    private String lastUpdated;
+    private String lastUpdatedBy;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getReceiptId() {
+        return receiptId;
+    }
+
+    public void setReceiptId(String receiptId) {
+        this.receiptId = receiptId;
+    }
+
+    public String getReceiptCode() {
+        return receiptCode;
+    }
+
+    public void setReceiptCode(String receiptCode) {
+        this.receiptCode = receiptCode;
+    }
+
+    public String getReceiptConfirmId() {
+        return receiptConfirmId;
+    }
+
+    public void setReceiptConfirmId(String receiptConfirmId) {
+        this.receiptConfirmId = receiptConfirmId;
+    }
+
+    public String getReceiptConfirmCode() {
+        return receiptConfirmCode;
+    }
+
+    public void setReceiptConfirmCode(String receiptConfirmCode) {
+        this.receiptConfirmCode = receiptConfirmCode;
+    }
+
+    public String getRefOrderId() {
+        return refOrderId;
+    }
+
+    public void setRefOrderId(String refOrderId) {
+        this.refOrderId = refOrderId;
+    }
+
+    public String getRefOrderDetailId() {
+        return refOrderDetailId;
+    }
+
+    public void setRefOrderDetailId(String refOrderDetailId) {
+        this.refOrderDetailId = refOrderDetailId;
+    }
+
+    public String getClientCode() {
+        return clientCode;
+    }
+
+    public void setClientCode(String clientCode) {
+        this.clientCode = clientCode;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getFacilityCode() {
+        return facilityCode;
+    }
+
+    public void setFacilityCode(String facilityCode) {
+        this.facilityCode = facilityCode;
+    }
+
+    public String getSkuCode() {
+        return skuCode;
+    }
+
+    public void setSkuCode(String skuCode) {
+        this.skuCode = skuCode;
+    }
+
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    public String getReceivedQty() {
+        return receivedQty;
+    }
+
+    public void setReceivedQty(String receivedQty) {
+        this.receivedQty = receivedQty;
+    }
+
+    public String getQuantityUM() {
+        return quantityUM;
+    }
+
+    public void setQuantityUM(String quantityUM) {
+        this.quantityUM = quantityUM;
+    }
+
+    public String getTotalWeight() {
+        return totalWeight;
+    }
+
+    public void setTotalWeight(String totalWeight) {
+        this.totalWeight = totalWeight;
+    }
+
+    public String getTotalVolume() {
+        return totalVolume;
+    }
+
+    public void setTotalVolume(String totalVolume) {
+        this.totalVolume = totalVolume;
+    }
+
+    public String getTotalVolumeWeight() {
+        return totalVolumeWeight;
+    }
+
+    public void setTotalVolumeWeight(String totalVolumeWeight) {
+        this.totalVolumeWeight = totalVolumeWeight;
+    }
+
+    public String getWeightUM() {
+        return weightUM;
+    }
+
+    public void setWeightUM(String weightUM) {
+        this.weightUM = weightUM;
+    }
+
+    public String getVolumeUM() {
+        return volumeUM;
+    }
+
+    public void setVolumeUM(String volumeUM) {
+        this.volumeUM = volumeUM;
+    }
+
+    public String getInventorySts() {
+        return inventorySts;
+    }
+
+    public void setInventorySts(String inventorySts) {
+        this.inventorySts = inventorySts;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+
+    public void setCreated(String created) {
+        this.created = created;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(String lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+}

service/src/main/java/com/hzya/frame/ttxofs/dto/ofswareconfirma/OfsWareConfirmaHeader.java

@@ -0,0 +1,163 @@
+package com.hzya.frame.ttxofs.dto.ofswareconfirma;
+
+/**
+ * Auto-generated: 2025-03-10 10:25:41
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class OfsWareConfirmaHeader {
+    private String id;
+    private String clientCode;
+    private String companyCode;
+    private String facilityCode;
+    private String code;
+    private String internalInstructionType;
+    private String bizChannel;
+    private String outBizCode;
+    private String refOrderId;
+    private String refOrderCode;
+    private String status;
+    private String receivedAt;
+    private String receivedBy;
+    private String created;
+    private String createdBy;
+    private String lastUpdated;
+    private String lastUpdatedBy;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getClientCode() {
+        return clientCode;
+    }
+
+    public void setClientCode(String clientCode) {
+        this.clientCode = clientCode;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getFacilityCode() {
+        return facilityCode;
+    }
+
+    public void setFacilityCode(String facilityCode) {
+        this.facilityCode = facilityCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getInternalInstructionType() {
+        return internalInstructionType;
+    }
+
+    public void setInternalInstructionType(String internalInstructionType) {
+        this.internalInstructionType = internalInstructionType;
+    }
+
+    public String getBizChannel() {
+        return bizChannel;
+    }
+
+    public void setBizChannel(String bizChannel) {
+        this.bizChannel = bizChannel;
+    }
+
+    public String getOutBizCode() {
+        return outBizCode;
+    }
+
+    public void setOutBizCode(String outBizCode) {
+        this.outBizCode = outBizCode;
+    }
+
+    public String getRefOrderId() {
+        return refOrderId;
+    }
+
+    public void setRefOrderId(String refOrderId) {
+        this.refOrderId = refOrderId;
+    }
+
+    public String getRefOrderCode() {
+        return refOrderCode;
+    }
+
+    public void setRefOrderCode(String refOrderCode) {
+        this.refOrderCode = refOrderCode;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getReceivedAt() {
+        return receivedAt;
+    }
+
+    public void setReceivedAt(String receivedAt) {
+        this.receivedAt = receivedAt;
+    }
+
+    public String getReceivedBy() {
+        return receivedBy;
+    }
+
+    public void setReceivedBy(String receivedBy) {
+        this.receivedBy = receivedBy;
+    }
+
+    public String getCreated() {
+        return created;
+    }
+
+    public void setCreated(String created) {
+        this.created = created;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(String lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+}

service/src/main/java/com/hzya/frame/ttxofs/dto/ofswareconfirma/OfsWareConfirmaResponse.java

@@ -0,0 +1,26 @@
+package com.hzya.frame.ttxofs.dto.ofswareconfirma;
+
+import com.hzya.frame.ttxofs.basics.ReturnMessageBasics;
+
+import java.util.List;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.ttxofs.dto.ofswareconfirma
+ * @Project：kangarooDataCenterV3
+ * @name：OfsWareConfirmaResponse
+ * @Date：2025/3/10 10:32
+ * @Filename：OfsWareConfirmaResponse
+ */
+public class OfsWareConfirmaResponse extends ReturnMessageBasics {
+
+    public List<OfsWareConfirmaData> data;
+
+    public List<OfsWareConfirmaData> getData() {
+        return data;
+    }
+
+    public void setData(List<OfsWareConfirmaData> data) {
+        this.data = data;
+    }
+}

service/src/main/java/com/hzya/frame/ttxofs/service/impl/OfsUnifiedServiceImpl.java

@@ -78,7 +78,9 @@ public class OfsUnifiedServiceImpl implements OfsUnifiedService {
             String resultStr = postParams(httpUrl, params);
             if (resultStr != null && !"".equals(resultStr.trim())) {
                 ReturnMessageBasics returnMessageBasics1 = JSON.parseObject(resultStr, returnMessageBasics.getClass());
-                if ("0".equals(returnMessageBasics1.getCode()) && "false".equals(returnMessageBasics1.getError())) {
+//                if ("0".equals(returnMessageBasics1.getCode()) && "false".equals(returnMessageBasics1.getError())) {
+                //2025 年 3 月 10 日 10:20:04 入库确认单如果调用成功没有返回error=false
+                if (returnMessageBasics1 != null && "0".equals(returnMessageBasics1.getCode()) && ("false".equals(returnMessageBasics1.getError()) || returnMessageBasics1.getError() == null || "".equals(returnMessageBasics1.getError().trim()))) {
                     //成功
                     return returnMessageBasics1;
                 } else {