From bbddd048ae9016ae89136eb0f108b80ca38ed4f4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 19:16:32 +0800
Subject: [PATCH] lsh#明细添加计划跟踪号、行号、批次
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 1290258..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
@@ -7,7 +7,6 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.phyz.*;
import com.vincent.rsf.openApi.service.phyz.ErpReportService;
-import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +27,8 @@
@Api("閾跺骇鏂板伐鍘傦紙浜旀湡锛塃RP鎺ュ彛")
@Slf4j
public class ERPController {
+
+ public static JSONArray map = new JSONArray();
@Resource
private ErpReportService erpReportService;
@@ -115,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("鍏�/鍑哄簱浠诲姟閫氱煡鍗曞彇娑�")
@@ -132,8 +142,6 @@
JSONArray params = paramsFormat(objParams);
List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- AsnOrderAndItemsParams asnOrderAndItemsParams = new AsnOrderAndItemsParams();
- // asnOrder/items/save
return CommonResponse.ok();
}
@@ -179,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);
@@ -293,9 +304,9 @@
// region 娴嬭瘯鎺ㄩ�佸姛鑳�
@ApiOperation("鐧诲綍")
@PostMapping("/loginBySign")
- public CommonResponse loginBySign(@RequestBody Object objParams) {
+ public CommonResponse loginBySign() {
try {
- erpReportService.loginBySign();
+ return CommonResponse.ok(erpReportService.loginBySign());
} catch (Exception e) {
log.error("erp, loginBySign", e);
}
@@ -306,7 +317,7 @@
@PostMapping("/reportInOrOutBound")
public CommonResponse reportInOrOutBound(@RequestBody Object objParams) {
try {
- erpReportService.reportInOrOutBound(objParams);
+ return erpReportService.reportInOrOutBound(objParams);
} catch (Exception e) {
log.error("erp, reportInOrOutBound", e);
}
--
Gitblit v1.9.1