From e20d964bfe6c573fc322694777e52a43364c1f74 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 03 二月 2026 09:52:13 +0800
Subject: [PATCH] 库存明细支持空值，增加支持表单
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 142 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 9b84423..8da1005 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
@@ -3,21 +3,27 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.vincent.rsf.framework.common.R;
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.feign.wms.WmsServerFeignClient;
import com.vincent.rsf.openApi.service.phyz.ErpReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import static com.vincent.rsf.openApi.controller.AuthController.SIMULATED_DATA_ENABLE;
@@ -32,6 +38,9 @@
@Resource
private ErpReportService erpReportService;
+
+ @Autowired(required = false)
+ private WmsServerFeignClient wmsServerFeignClient;
@ApiOperation("浠撳簱淇℃伅鍚屾")
@@ -116,10 +125,16 @@
JSONArray params = paramsFormat(objParams);
List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
+ StringBuffer errorMsg = new StringBuffer();
for (Order order : orderList) {
- erpReportService.addOrderToServer(order);
+ String i = erpReportService.addOrderToServer(order);
+ if (i.equals("200")){
+ errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
+ } else {
+ errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
+ }
}
- return CommonResponse.ok();
+ return CommonResponse.ok(errorMsg.toString());
}
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗曞彇娑�")
@@ -139,9 +154,23 @@
return CommonResponse.ok();
}
+ @ApiOperation("搴撳瓨鏌ヨ鏄庣粏锛堣〃鍗曟彁浜わ級")
+ @PostMapping(value = "/inventory/details", consumes = "application/x-www-form-urlencoded")
+ public CommonResponse queryInventoryDetailsForm(HttpServletRequest request) {
+ // 浠庤〃鍗曞弬鏁版瀯寤烘煡璇㈡潯浠�
+ InventoryQueryCondition condition = buildConditionFromRequestParams(request);
+ // 璋冪敤JSON澶勭悊鏂规硶
+ return queryInventoryDetails(condition);
+ }
+
@ApiOperation("搴撳瓨鏌ヨ鏄庣粏")
- @PostMapping("/inventory/details")
- public CommonResponse queryInventoryDetails(@RequestBody JSONObject params) {
+ @PostMapping(value = "/inventory/details", consumes = "application/json")
+ public CommonResponse queryInventoryDetails(@RequestBody(required = false) InventoryQueryCondition condition) {
+ // JSON鏂瑰紡锛氭敮鎸佷笉浼犻�掑弬鏁帮紙{}鎴杗ull鎴栫┖璇锋眰浣擄級锛屽垱寤洪粯璁ょ殑绌烘煡璇㈡潯浠跺璞�
+ if (condition == null) {
+ condition = new InventoryQueryCondition();
+ }
+
if (SIMULATED_DATA_ENABLE.equals("1")) {
String x = "[\n" +
" {\n" +
@@ -187,10 +216,72 @@
return CommonResponse.ok(JSONArray.parseArray(map.toJSONString(), InventoryDetails.class));
}
- InventoryQueryCondition condition = JSON.parseObject(params.toJSONString(), InventoryQueryCondition.class);
- // 鏁版嵁澶勭悊锛岃浆鍙憇erver
- List<InventoryDetails> inventoryDetails = Lists.newArrayList();
- return new CommonResponse().setCode(200).setData(inventoryDetails);
+ try {
+ if (wmsServerFeignClient == null) {
+ log.warn("WmsServerFeignClient鏈敞鍏ワ紝鏃犳硶杩涜璋冪敤");
+ return CommonResponse.error("鏈嶅姟鏈垵濮嬪寲");
+ }
+
+ log.info("搴撳瓨鏌ヨ鏄庣粏璇锋眰鍙傛暟锛� {}", JSON.toJSONString(condition));
+
+ // 鐩存帴浼犻�掑疄浣撶被锛孎eign浼氳嚜鍔ㄥ簭鍒楀寲涓篔SON
+ R result = wmsServerFeignClient.queryInventoryDetails(condition);
+
+ log.info("搴撳瓨鏌ヨ鏄庣粏杩斿洖缁撴灉锛� {}", JSON.toJSONString(result));
+
+ if (result != null) {
+ // R绫荤户鎵胯嚜HashMap锛屼娇鐢╣et鏂规硶鑾峰彇鍊�
+ Integer code = (Integer) result.get("code");
+ String msg = (String) result.get("msg");
+ Object data = result.get("data");
+
+ if (code != null && code == 200) {
+ // 灏哅ap鍒楄〃杞崲涓篒nventoryDetails鍒楄〃
+ if (data != null) {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> dataList = (List<Map<String, Object>>) data;
+ List<InventoryDetails> inventoryDetails = new ArrayList<>();
+ for (Map<String, Object> item : dataList) {
+ InventoryDetails details = JSON.parseObject(JSON.toJSONString(item), InventoryDetails.class);
+ inventoryDetails.add(details);
+ }
+ return CommonResponse.ok(inventoryDetails);
+ } else {
+ return CommonResponse.ok(new ArrayList<>());
+ }
+ } else {
+ return CommonResponse.error(msg != null ? msg : "鏌ヨ澶辫触");
+ }
+ } else {
+ return CommonResponse.error("鏌ヨ澶辫触锛氳繑鍥炵粨鏋滀负绌�");
+ }
+ } catch (Exception e) {
+ log.error("搴撳瓨鏌ヨ鏄庣粏澶辫触", e);
+ // 杩囨护閿欒娑堟伅涓殑URL锛屽彧淇濈暀閿欒绫诲瀷
+ String errorMessage = e.getMessage();
+ if (errorMessage != null) {
+ // 濡傛灉鍖呭惈"executing"锛岃鏄庢槸HTTP璇锋眰閿欒锛屽幓鎺塙RL閮ㄥ垎
+ if (errorMessage.contains("executing")) {
+ int executingIndex = errorMessage.indexOf("executing");
+ if (executingIndex > 0) {
+ // 鎻愬彇"executing"涔嬪墠鐨勯儴鍒嗭紙濡�"Read timed out"锛�
+ errorMessage = errorMessage.substring(0, executingIndex).trim();
+ } else {
+ // 濡傛灉"executing"鍦ㄥ紑澶达紝浣跨敤榛樿閿欒娑堟伅
+ errorMessage = "璇锋眰瓒呮椂";
+ }
+ }
+ // 濡傛灉鍖呭惈"http://"鎴�"https://"锛屼篃灏濊瘯鍘绘帀URL閮ㄥ垎
+ else if (errorMessage.contains("http://") || errorMessage.contains("https://")) {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忓幓鎺塙RL
+ errorMessage = errorMessage.replaceAll("https?://[^\\s]+", "").trim();
+ if (errorMessage.isEmpty()) {
+ errorMessage = "璇锋眰澶辫触";
+ }
+ }
+ }
+ return CommonResponse.error("鏌ヨ澶辫触锛�" + (errorMessage != null && !errorMessage.isEmpty() ? errorMessage : "鏈煡閿欒"));
+ }
}
@ApiOperation("搴撳瓨鏌ヨ姹囨��")
@@ -319,4 +410,47 @@
}
// endregion
+
+ /**
+ * 浠庤姹傚弬鏁帮紙琛ㄥ崟鏁版嵁锛夋瀯寤烘煡璇㈡潯浠跺璞�
+ * 鏀寔 application/x-www-form-urlencoded 鏍煎紡
+ */
+ private InventoryQueryCondition buildConditionFromRequestParams(HttpServletRequest request) {
+ InventoryQueryCondition condition = new InventoryQueryCondition();
+
+ // 浠庤姹傚弬鏁颁腑鑾峰彇瀛楁鍊�
+ String wareHouseId = request.getParameter("wareHouseId");
+ String locId = request.getParameter("locId");
+ String matNr = request.getParameter("matNr");
+ String matGroup = request.getParameter("matGroup");
+ String orderNo = request.getParameter("orderNo");
+ String planNo = request.getParameter("planNo");
+ String batch = request.getParameter("batch");
+
+ // 璁剧疆瀛楁鍊硷紙濡傛灉瀛樺湪锛�
+ if (wareHouseId != null && !wareHouseId.isEmpty()) {
+ condition.setWareHouseId(wareHouseId);
+ }
+ if (locId != null && !locId.isEmpty()) {
+ condition.setLocId(locId);
+ }
+ if (matNr != null && !matNr.isEmpty()) {
+ condition.setMatNr(matNr);
+ }
+ if (matGroup != null && !matGroup.isEmpty()) {
+ condition.setMatGroup(matGroup);
+ }
+ if (orderNo != null && !orderNo.isEmpty()) {
+ condition.setOrderNo(orderNo);
+ }
+ if (planNo != null && !planNo.isEmpty()) {
+ condition.setPlanNo(planNo);
+ }
+ if (batch != null && !batch.isEmpty()) {
+ condition.setBatch(batch);
+ }
+
+ return condition;
+ }
+
}
--
Gitblit v1.9.1