From 4d5c3bd8bfea7a5ae0b3cd606156a1e83e633bd9 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 18 三月 2026 12:37:22 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WarehouseParams.java | 3 +
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 15 ++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java | 5 +
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 122 ++++++++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/WmsConstant.java | 9 +++
7 files changed, 156 insertions(+), 6 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 ce11bbe..9b41edc 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
@@ -56,7 +56,11 @@
JSONArray params = paramsFormat(objParams);
List<Warehouse> warehouseList = JSON.parseArray(params.toJSONString(), Warehouse.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ String resultMsg = erpReportService.syncWareHouse(warehouseList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("鐗╂枡淇℃伅鍚屾")
@@ -73,7 +77,11 @@
JSONArray params = paramsFormat(objParams);
List<Material> materialList = JSON.parseArray(params.toJSONString(), Material.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ String resultMsg = erpReportService.syncMaterial(materialList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("瀹㈡埛淇℃伅鍚屾")
@@ -131,6 +139,9 @@
errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
} else {
errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
+ if (orderList.size()==1){
+ return CommonResponse.error(errorMsg.toString());
+ }
}
}
return CommonResponse.ok(errorMsg.toString());
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 b47590e..109aeef 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
@@ -7,6 +7,15 @@
public static String callBack = "/rsf-server/wcs/receive/ex/msg";
+ //鍩虹淇℃伅:搴撲綅淇℃伅鍚屾
+ 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 QUERY_ORDER_AND_DETLS = "/rsf-server/erp/query/order";
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 b650375..20d3fcb 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,13 +2,18 @@
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 java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
+import java.util.List;
public interface ErpReportService {
+ String syncMaterial(List<Material> materialList);
+ String syncWareHouse(List<Warehouse> warehouseList);
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 cac9cbd..3e070c8 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
@@ -12,7 +12,9 @@
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.service.WmsErpService;
import com.vincent.rsf.openApi.service.phyz.ErpReportService;
import com.vincent.rsf.openApi.utils.ParamsMapUtils;
@@ -70,8 +72,128 @@
ERP_REPORT_URL = erpApi.getErpUrl();
}
+ @Override
+ public String syncMaterial(List<Material> materialList){
+ if (materialList.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String wmsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.SYNC_MATNRS;
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ // Material -> BaseMatParms 瀛楁涓�涓�瀵瑰簲鍚庡啀涓嬪彂
+ List<Map<String, Object>> baseMatParamsList = materialToBaseMatParams(materialList);
+ HttpEntity httpEntity2 = new HttpEntity<>(baseMatParamsList, headers);//cs
+ // sync/warehouse
+ 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) {
+// JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
+ return "200";
+ } else {
+ return result.getMsg();
+// throw new CoolException("鏌ヨ澶辫触锛侊紒");
+ }
+ } catch (JsonProcessingException e) {
+ return e.getMessage();
+// throw new CoolException(e.getMessage());
+ }
+ }
+ }
+ /**
+ * Material 瀛楁鏄犲皠涓� server 绔� BaseMatParms 瀛楁
+ */
+ private List<Map<String, Object>> materialToBaseMatParams(List<Material> materialList) {
+ List<Map<String, Object>> mappedList = new ArrayList<>();
+ for (Material material : materialList) {
+ if (Objects.isNull(material)) {
+ continue;
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("maktx", material.getMakTx());
+ map.put("matnr", material.getMatNr());
+ map.put("groupName", material.getGroupName());
+ map.put("model", material.getModel());
+ map.put("weight", material.getWeight() == null ? null : material.getWeight().toString());
+ map.put("color", material.getColor());
+ map.put("size", material.getSize());
+ map.put("spec", material.getSpec());
+ map.put("describle", material.getDescribe());
+ map.put("unit", material.getUnit());
+ mappedList.add(map);
+ }
+ return mappedList;
+ }
+ @Override
+ public String syncWareHouse(List<Warehouse> warehouseList){
+ if (warehouseList.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String wmsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.SYNC_WAREHOUSE;
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ // Warehouse -> WarehouseParams 瀛楁涓�涓�瀵瑰簲鍚庡啀涓嬪彂
+ List<Map<String, Object>> warehouseParamsList = warehouseToWarehouseParams(warehouseList);
+ HttpEntity httpEntity2 = new HttpEntity<>(warehouseParamsList, headers);//cs
+ // sync/warehouse
+ 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) {
+// JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
+ return "200";
+ } else {
+ return result.getMsg();
+// throw new CoolException("鏌ヨ澶辫触锛侊紒");
+ }
+ } catch (JsonProcessingException e) {
+ return e.getMessage();
+// throw new CoolException(e.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Warehouse 瀛楁鏄犲皠涓� server 绔� WarehouseParams 瀛楁
+ */
+ private List<Map<String, Object>> warehouseToWarehouseParams(List<Warehouse> warehouseList) {
+ List<Map<String, Object>> mappedList = new ArrayList<>();
+ for (Warehouse warehouse : warehouseList) {
+ if (Objects.isNull(warehouse)) {
+ continue;
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", warehouse.getWareHouseName());
+ map.put("code", warehouse.getUseOrgId());
+ map.put("factory", warehouse.getUseOrgName());
+ map.put("address", warehouse.getAddress());
+ map.put("type", null);
+ map.put("longitude", null);
+ map.put("latitude", null);
+ mappedList.add(map);
+ }
+ return mappedList;
+ }
+
+ @Override
public String addOrderToServer(Order order) {
if (Objects.isNull(order.getOrderNo()) || order.getOrderNo().isEmpty()) {
throw new CoolException("璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
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 fdcdd20..cab3248 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
@@ -25,10 +25,10 @@
private ReceiveMsgService receiveMsgService;
/**
- * @author Ryan
- * @date 2025/8/19
+ * @author Munch D. Luffy
+ * @date 2026/3/18
* @description: 鐗╂枡淇℃伅鍚屾
- * @version 1.0
+ * @version 1.1
*/
@ApiOperation(value = "鍩虹鐗╂枡淇℃伅鍚屾")
@PostMapping("/sync/base/matnrs")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WarehouseParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WarehouseParams.java
index 9834834..fef5d8d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WarehouseParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WarehouseParams.java
@@ -18,6 +18,9 @@
@ApiModelProperty("宸ュ巶")
private String factory;
+ @ApiModelProperty("缂栫爜")
+ private String code;
+
@ApiModelProperty("鍦板潃")
private String address;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 3a832b1..715cf43 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -218,7 +218,7 @@
mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx());
if (!Objects.isNull(matnr.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()).last("limit 1"), false);
- if (Objects.isNull(matnrGroup)) {
+ if (!Objects.isNull(matnrGroup)) {
mat.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
}
--
Gitblit v1.9.1