From f1148a16d18e7d0f095fbd2341410104de665fc1 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 14:39:54 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 3 ++-
rsf-open-api/src/main/resources/application-dev.yml | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 8 +++-----
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
index 011fa3f..a8acd14 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
import com.vincent.rsf.openApi.service.WmsErpService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +18,7 @@
@RestController
@RequestMapping("/erp")
+@Api("ERP鎺ュ彛瀵规帴")
public class WmsErpController {
@Autowired
@@ -90,6 +92,5 @@
}
return wmsErpService.syncMatnrs(parms);
}
-
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 8674d61..ff2a6ae 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -178,7 +178,7 @@
}
/**WMS鍩虹閰嶇疆閾炬帴*/
String rcsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.UPDATE_MATNR_INFO;
- log.info("鐗╂枡淇敼锛� {}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
+ log.info("鐗╂枡淇敼锛歿}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index e3f40c7..646090f 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -63,6 +63,6 @@
port: 8088
wms:
#閾炬帴
- host: http://127.0.0.1銆�
+ host: http://127.0.0.1
#绔彛
port: 8085
\ No newline at end of file
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 9584a8f..1f5f9cb 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
@@ -753,8 +753,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R matUpdate(BaseMatParms baseMatParms) {
- if (StringUtils.isNotBlank(baseMatParms.getMatnr())) {
- throw new CoolException("鍩虹淇℃伅鍙樻洿澶辫触锛侊紒");
+ if (StringUtils.isBlank(baseMatParms.getMatnr())) {
+ throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
if (Objects.isNull(matnr)) {
@@ -772,15 +772,13 @@
throw new CoolException("鐗╂枡鏂板澶辫触锛侊紒");
}
} else {
-
if (!Objects.isNull(baseMatParms.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
- if (Objects.isNull(matnrGroup)) {
+ if (!Objects.isNull(matnrGroup)) {
matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
}
-
matnr.setName(baseMatParms.getMaktx())
.setColor(baseMatParms.getColor())
.setModel(baseMatParms.getModel())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index ccfd0fc..58e365e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -41,6 +41,8 @@
"/email/code",
"/pda/login",
"/erp/**",
+ "/base/**",
+ "/order/**",
"/login",
"/register",
"/druid/**",
--
Gitblit v1.9.1