From fb265bc00a43a463a95fc380ded0221e4535f997 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 14:41:51 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 b1c826e..a75afc4 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
@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.phyz.*;
+import com.vincent.rsf.openApi.service.phyz.ErpReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
@@ -25,6 +27,12 @@
@Api("閾跺骇鏂板伐鍘傦紙浜旀湡锛塃RP鎺ュ彛")
@Slf4j
public class ERPController {
+
+ public static JSONArray map = new JSONArray();
+
+ @Resource
+ private ErpReportService erpReportService;
+
@ApiOperation("浠撳簱淇℃伅鍚屾")
@PostMapping("/wareHouse/sync")
@@ -108,7 +116,16 @@
JSONArray params = paramsFormat(objParams);
List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ StringBuffer errorMsg = new StringBuffer();
+ for (Order order : orderList) {
+ String i = erpReportService.addOrderToServer(order);
+ if (i.equals("200")){
+ errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
+ } else {
+ errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
+ }
+ }
+ return CommonResponse.ok(errorMsg.toString());
}
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗曞彇娑�")
@@ -170,7 +187,10 @@
" \"stockOrgId\": \"ORG001\"\n" +
" }\n" +
"]";
- return CommonResponse.ok(JSONArray.parseArray(x, InventoryDetails.class));
+ if (map == null || map.isEmpty()) {
+ map = JSON.parseArray(x);
+ }
+ return CommonResponse.ok(JSONArray.parseArray(map.toJSONString(), InventoryDetails.class));
}
InventoryQueryCondition condition = JSON.parseObject(params.toJSONString(), InventoryQueryCondition.class);
@@ -281,4 +301,28 @@
return new JSONArray();
}
+ // region 娴嬭瘯鎺ㄩ�佸姛鑳�
+ @ApiOperation("鐧诲綍")
+ @PostMapping("/loginBySign")
+ public CommonResponse loginBySign() {
+ try {
+ return CommonResponse.ok(erpReportService.loginBySign());
+ } catch (Exception e) {
+ log.error("erp, loginBySign", e);
+ }
+ return CommonResponse.ok();
+ }
+
+ @ApiOperation("鍏�/鍑哄簱浠诲姟鍥炶皟")
+ @PostMapping("/reportInOrOutBound")
+ public CommonResponse reportInOrOutBound(@RequestBody Object objParams) {
+ try {
+ return erpReportService.reportInOrOutBound(objParams);
+ } catch (Exception e) {
+ log.error("erp, reportInOrOutBound", e);
+ }
+ return CommonResponse.ok();
+ }
+ // endregion
+
}
--
Gitblit v1.9.1