From 5c5ac364457ece1af7238ab325074a32df93d9cd Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 23 十二月 2025 14:43:58 +0800
Subject: [PATCH] 添加库存查询接口
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 21 +++++++++++++++++++++
src/main/java/com/zy/api/service/KopenApiService.java | 11 +++++++++++
src/main/java/com/zy/api/entity/dto/XSR.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/api/controller/KopenApiController.java | 16 ++++++++++++++++
5 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index ae7619e..9079749 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,6 +1,8 @@
package com.zy.api.controller;
+import com.zy.api.controller.params.PageRequestParams;
+import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockUpOrderParams;
@@ -145,6 +147,20 @@
}
+ /**
+ * 鏌ヨWMS搴撳瓨淇℃伅
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("鏌ヨWMS搴撳瓨淇℃伅")
+ @PostMapping("/getStockInfo")
+ public XSR getStockInfo(@RequestBody PageRequestParams params) {
+ return kopenApiService.getStockInfo(params);
+ }
+
+
}
diff --git a/src/main/java/com/zy/api/entity/dto/XSR.java b/src/main/java/com/zy/api/entity/dto/XSR.java
index 6a1d984..842a586 100644
--- a/src/main/java/com/zy/api/entity/dto/XSR.java
+++ b/src/main/java/com/zy/api/entity/dto/XSR.java
@@ -23,7 +23,7 @@
private String returnMessage;
- private T data;
+ private T result;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -47,7 +47,7 @@
.setSuccess(true)
.setMessage("鎿嶄綔鎴愬姛")
.setReturnMessage("鎿嶄綔鎴愬姛")
- .setData(data);
+ .setResult(data);
}
public static <T> XSR<T> ok(T data, String message) {
@@ -56,7 +56,7 @@
.setSuccess(true)
.setMessage(message)
.setReturnMessage(message)
- .setData(data);
+ .setResult(data);
}
public static <T> XSR<T> error(String message) {
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index b368a52..9ade614 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.zy.api.controller.params.PageRequestParams;
+import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockUpOrderParams;
@@ -59,4 +61,13 @@
* @return com.core.common.R
*/
XSR getOutDetails(StockUpOrderParams params);
+
+ /**
+ * 鏌ヨWMS搴撳瓨淇℃伅
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ XSR getStockInfo(PageRequestParams params);
}
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 8741174..5004c49 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.exception.CoolException;
+import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.OutOrderParams;
@@ -15,12 +17,14 @@
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
import com.zy.api.service.KopenApiService;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.OrderSettle;
import com.zy.asrs.enums.OrderTypeEnum;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
@@ -46,6 +50,8 @@
private OrderDetlService orderDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
/**
* 鎺ユ敹涓嬪彂璁㈠崟淇℃伅
@@ -445,4 +451,19 @@
return XSR.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
}
+ /**
+ * 鏌ヨWMS搴撳瓨淇℃伅
+ *
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public XSR getStockInfo(PageRequestParams params) {
+ Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), new EntityWrapper<LocDetl>()
+ .eq(!Objects.isNull(params.getPro_komcode()), "matnr", params.getPro_komcode())
+ .eq(Objects.isNull(params.getPro_id()),"supp_code", params.getPro_id()));
+
+ return XSR.ok(locDetls.getRecords());
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6a927f4..db179b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -991,7 +991,7 @@
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
- .setPath(MesConstant.PACK_DOWN_URL)
+ .setPath(MesConstant.IN_DISPATCH_RESULT)
.setJson(JSON.toJSONString(mesCombParam))
.build()
.doPost();
--
Gitblit v1.9.1