From fdaef787cf4ffe516a395559abe75db531af9af8 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 18 三月 2026 13:27:58 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 10 +++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java | 9 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java | 1
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java | 6 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 126 ++++++++++++++++++++++++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java | 5 +
7 files changed, 145 insertions(+), 14 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index 9b41edc..eb790f4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -98,7 +98,11 @@
JSONArray params = paramsFormat(objParams);
List<Customer> customerList = JSON.parseArray(params.toJSONString(), Customer.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ String resultMsg = erpReportService.syncCustomer(customerList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("渚涘簲鍟嗕俊鎭悓姝�")
@@ -115,6 +119,10 @@
JSONArray params = paramsFormat(objParams);
List<Supplier> supplierList = JSON.parseArray(params.toJSONString(), Supplier.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
+ String resultMsg = erpReportService.syncSupplier(supplierList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
return CommonResponse.ok();
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
index 109aeef..4170757 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java
@@ -10,12 +10,15 @@
//鍩虹淇℃伅:搴撲綅淇℃伅鍚屾
public static String SYNC_LOCS = "/rsf-server/base/sync/locs";
- //鍩虹淇℃伅:浠撳簱淇℃伅鍚屾
+ //鍩虹淇℃伅:鐗╂枡淇℃伅鍚屾
public static String SYNC_MATNRS = "/rsf-server/base/sync/base/matnrs";
//鍩虹淇℃伅:浠撳簱淇℃伅鍚屾
public static String SYNC_WAREHOUSE = "/rsf-server/base/sync/warehouse";
+ //鍩虹淇℃伅:浼佷笟淇℃伅鍚屾
+ public static String SYNC_COMPANIES = "/rsf-server/base/sync/companies";
+
//璁㈠崟淇℃伅鏌ヨ
public static String QUERY_ORDER_AND_DETLS = "/rsf-server/erp/query/order";
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
index 7eb60fc..c822b12 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
@@ -17,16 +17,17 @@
// 瀹㈡埛缂栫爜锛屽敮涓�鏍囪瘑
@NotNull
@JsonProperty("customerId")
- private String customerId;
+ private String customerId;//瀵瑰簲private String code;浼佷笟缂栫爜
// 瀹㈡埛鍚嶇О
@JsonProperty("customerName")
- private String customerName;
+ private String customerName;//private String name;//浼佷笟鍚嶇О
// 瀹㈡埛鏄电О
- private String customerNickName;
+ private String customerNickName;//private String breifCode;//浼佷笟鍔╄鐮�
// 瀹㈡埛鍒嗙粍锛屽浗鍐咃紝鍥藉
private String customerGroup;
+ private String type = "customer";//type 鍥哄畾鍊�
// 鑱旂郴浜�
- private String contact;
+ private String contact;//鑱旂郴浜�
// 鑱旂郴鐢佃瘽
private String telephone;
// 閭
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
index 1c12d27..d1ed274 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
@@ -25,6 +25,7 @@
private String supplierNickName;
// 渚涘簲鍟嗗垎缁勶紝鍥藉唴锛屽浗澶�
private String supplierGroup;
+ private String type = "supplier";
// 鑱旂郴浜�
private String contact;
// 鑱旂郴鐢佃瘽
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
index 20d3fcb..268749e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java
@@ -2,9 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
-import com.vincent.rsf.openApi.entity.phyz.Material;
-import com.vincent.rsf.openApi.entity.phyz.Order;
-import com.vincent.rsf.openApi.entity.phyz.Warehouse;
+import com.vincent.rsf.openApi.entity.phyz.*;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
@@ -14,6 +12,8 @@
String syncMaterial(List<Material> materialList);
String syncWareHouse(List<Warehouse> warehouseList);
+ String syncCustomer(List<Customer> customerList);
+ String syncSupplier(List<Supplier> supplierList);
String addOrderToServer(Order order);
JSONObject loginBySign() throws UnsupportedEncodingException, NoSuchAlgorithmException;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
index 3e070c8..d982b35 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
@@ -11,10 +11,7 @@
import com.vincent.rsf.openApi.config.PlatformProperties;
import com.vincent.rsf.openApi.entity.constant.WmsConstant;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
-import com.vincent.rsf.openApi.entity.phyz.ErpReportParams;
-import com.vincent.rsf.openApi.entity.phyz.Material;
-import com.vincent.rsf.openApi.entity.phyz.Order;
-import com.vincent.rsf.openApi.entity.phyz.Warehouse;
+import com.vincent.rsf.openApi.entity.phyz.*;
import com.vincent.rsf.openApi.service.WmsErpService;
import com.vincent.rsf.openApi.service.phyz.ErpReportService;
import com.vincent.rsf.openApi.utils.ParamsMapUtils;
@@ -170,6 +167,71 @@
}
}
}
+ @Override
+ public String syncCustomer(List<Customer> customerList){
+ if (customerList.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String wmsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.SYNC_COMPANIES;
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ // Customer -> CompaniesParam 瀛楁涓�涓�瀵瑰簲鍚庡啀涓嬪彂
+ List<Map<String, Object>> companiesParamsList = customerToCompaniesParams(customerList);
+ HttpEntity httpEntity2 = new HttpEntity<>(companiesParamsList, headers);//cs
+ ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity2, String.class);//cs
+ log.info("鍚屾瀹㈡埛淇℃伅杩斿洖缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("鏌ヨ澶辫触锛侊紒");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ return "200";
+ } else {
+ return result.getMsg();
+ }
+ } catch (JsonProcessingException e) {
+ return e.getMessage();
+ }
+ }
+ }
+
+ @Override
+ public String syncSupplier(List<Supplier> supplierList){
+ if (supplierList.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String wmsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.SYNC_COMPANIES;
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ // Supplier -> supplierParams 瀛楁涓�涓�瀵瑰簲鍚庡啀涓嬪彂
+ List<Map<String, Object>> supplierParamsList = customerToSupplierParams(supplierList);
+ HttpEntity httpEntity2 = new HttpEntity<>(supplierParamsList, headers);//cs
+ ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity2, String.class);//cs
+ log.info("鍚屾瀹㈡埛淇℃伅杩斿洖缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("鏌ヨ澶辫触锛侊紒");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ return "200";
+ } else {
+ return result.getMsg();
+ }
+ } catch (JsonProcessingException e) {
+ return e.getMessage();
+ }
+ }
+ }
/**
* Warehouse 瀛楁鏄犲皠涓� server 绔� WarehouseParams 瀛楁
@@ -193,6 +255,62 @@
return mappedList;
}
+ /**
+ * Customer 瀛楁鏄犲皠涓� server 绔� CompaniesParam 瀛楁
+ */
+ private List<Map<String, Object>> customerToCompaniesParams(List<Customer> customerList) {
+ List<Map<String, Object>> mappedList = new ArrayList<>();
+ for (Customer customer : customerList) {
+ if (Objects.isNull(customer)) {
+ continue;
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", customer.getCustomerName());
+ map.put("nameEn", null);
+ map.put("breifCode", customer.getCustomerNickName());
+ // server 绔被鍨嬭浆鎹娇鐢ㄤ腑鏂囨弿杩�
+ map.put("type", customer.getType());
+ map.put("contact", customer.getContact());
+ map.put("tel", customer.getTelephone());
+ map.put("email", customer.getEmail());
+ map.put("pcode", null);
+ map.put("city", customer.getCustomerGroup());
+ map.put("province", null);
+ map.put("address", customer.getAddress());
+ map.put("code", customer.getCustomerId());
+ mappedList.add(map);
+ }
+ return mappedList;
+ }
+
+ /**
+ * Customer 瀛楁鏄犲皠涓� server 绔� CompaniesParam 瀛楁
+ */
+ private List<Map<String, Object>> customerToSupplierParams(List<Supplier> supplierList) {
+ List<Map<String, Object>> mappedList = new ArrayList<>();
+ for (Supplier supplier : supplierList) {
+ if (Objects.isNull(supplier)) {
+ continue;
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", supplier.getSupplierName());
+ map.put("nameEn", null);
+ map.put("breifCode", supplier.getSupplierName());
+ // server 绔被鍨嬭浆鎹娇鐢ㄤ腑鏂囨弿杩�
+ map.put("type", supplier.getType());
+ map.put("contact", supplier.getContact());
+ map.put("tel", supplier.getTelephone());
+ map.put("email", supplier.getEmail());
+ map.put("pcode", null);
+ map.put("city", supplier.getSupplierGroup());
+ map.put("province", null);
+ map.put("address", supplier.getAddress());
+ map.put("code", supplier.getSupplierId());
+ mappedList.add(map);
+ }
+ return mappedList;
+ }
+
@Override
public String addOrderToServer(Order order) {
if (Objects.isNull(order.getOrderNo()) || order.getOrderNo().isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
index cab3248..5095931 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
@@ -114,7 +114,7 @@
/**
* @author Ryan
* @date 2025/8/19
- * @description: 浠撳簱淇℃伅鍚屾
+ * @description: 浼佷笟淇℃伅鍚屾
* @version 1.0
*/
@ApiOperation(value = "浼佷笟淇℃伅鍚屾")
--
Gitblit v1.9.1