diff --git a/cuixing-erp/src/main/java/com/cuixing/erp/domain/ErpInspectBill.java b/cuixing-erp/src/main/java/com/cuixing/erp/domain/ErpInspectBill.java index b993bae..7f52fbb 100644 --- a/cuixing-erp/src/main/java/com/cuixing/erp/domain/ErpInspectBill.java +++ b/cuixing-erp/src/main/java/com/cuixing/erp/domain/ErpInspectBill.java @@ -92,7 +92,7 @@ public class ErpInspectBill implements Serializable { /** * 检验员ID */ - private Long inspectorId; + private String inspectorId; /** * 业务类型 */ diff --git a/cuixing-erp/src/main/java/com/cuixing/erp/domain/JDInspectBillJsonResponse.java b/cuixing-erp/src/main/java/com/cuixing/erp/domain/JDInspectBillJsonResponse.java index 8ff4413..43dbd23 100644 --- a/cuixing-erp/src/main/java/com/cuixing/erp/domain/JDInspectBillJsonResponse.java +++ b/cuixing-erp/src/main/java/com/cuixing/erp/domain/JDInspectBillJsonResponse.java @@ -219,7 +219,7 @@ public class JDInspectBillJsonResponse { * 检验员 */ @JsonProperty("InspectorId") - private Object inspectorId; + private Inspector inspectorId; /** * 业务类型 */ @@ -283,6 +283,31 @@ public class JDInspectBillJsonResponse { private Object bosConvertTakeDataInfo; } + /** + * 质检人对象 + */ + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class Inspector { + @JsonProperty("id") + private Long id; + @JsonProperty("msterID") + private Long msterID; + @JsonProperty("MultiLanguageText") + private List MultiLanguageText; + @JsonProperty("Name") + private List Name; + @JsonProperty("Number") + private String Number; + @JsonProperty("DEPTID_Id") + private Long DEPTID_Id; + @JsonProperty("DEPTID") + private Object DEPTID; + @JsonProperty("BD_InspectorEntry") + private Object BD_InspectorEntry; + } + /** * 检验条目对象 (Entity) */ diff --git a/cuixing-erp/src/main/java/com/cuixing/erp/service/impl/synchronousServiceImpl.java b/cuixing-erp/src/main/java/com/cuixing/erp/service/impl/synchronousServiceImpl.java index 0959478..316c6c1 100644 --- a/cuixing-erp/src/main/java/com/cuixing/erp/service/impl/synchronousServiceImpl.java +++ b/cuixing-erp/src/main/java/com/cuixing/erp/service/impl/synchronousServiceImpl.java @@ -431,7 +431,6 @@ public class synchronousServiceImpl implements synchronousService { String response = client.view(formId, jsonData); T jsonResponse = mapper.readValue(response, responseClass); - // 过滤数据并处理(使用Redis检查) if (shouldProcessFromRedis(jsonResponse, cacheKey)) { processor.process(jsonResponse); @@ -982,6 +981,9 @@ public class synchronousServiceImpl implements synchronousService { erpInspectBill.setCreatorId(getNameValue(inspectBill.getCreatorId().getName())); erpInspectBill.setFBillTypeId(getNameValue(inspectBill.getFBillTypeId().getName())); erpInspectBill.setSourceOrgId(getNameValue(inspectBill.getSourceOrgId().getName())); + if (inspectBill.getInspectorId()!=null){ + erpInspectBill.setInspectorId(getNameValue(inspectBill.getInspectorId().getName())); + } logger.info("质检单信息:{}", erpInspectBill); // 插入主订单