From 01a74bb0c1835cb56c410a62bef1e66f605f7103 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 13:12:02 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/controller/WcsApiController.java | 17 +++++
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 79 ++++++++++++++++++++++++++
src/main/java/com/zy/common/constant/MesConstant.java | 4 +
src/main/java/com/zy/api/service/impl/HWmsApiServiceImpl.java | 12 ++--
src/main/java/com/zy/api/service/WcsApiService.java | 9 +++
5 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/WcsApiController.java b/src/main/java/com/zy/api/controller/WcsApiController.java
index b8537ff..f6afa3d 100644
--- a/src/main/java/com/zy/api/controller/WcsApiController.java
+++ b/src/main/java/com/zy/api/controller/WcsApiController.java
@@ -41,6 +41,23 @@
}
return wcsApiService.lockLocs(params);
+ }
+
+ /**
+ * 鍥炲簱鎼繍鎸囦护
+ * @author Ryan
+ * @date 2026/1/10 13:08
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("鍫嗗灈鏈哄洖搴撴惉杩愭寚浠�")
+ @PostMapping("/back/loc")
+ public R backLoc(@RequestBody ReceviceTaskParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wcsApiService.backLocs(params);
}
}
diff --git a/src/main/java/com/zy/api/service/WcsApiService.java b/src/main/java/com/zy/api/service/WcsApiService.java
index 8a7aa2b..11b3f84 100644
--- a/src/main/java/com/zy/api/service/WcsApiService.java
+++ b/src/main/java/com/zy/api/service/WcsApiService.java
@@ -13,4 +13,13 @@
* @return com.core.common.R
*/
R lockLocs(ReceviceTaskParams params);
+
+ /**
+ * 鍥炲簱鎼繍鎸囦护
+ * @author Ryan
+ * @date 2026/1/10 13:08
+ * @param params
+ * @return com.core.common.R
+ */
+ R backLocs(ReceviceTaskParams params);
}
diff --git a/src/main/java/com/zy/api/service/impl/HWmsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HWmsApiServiceImpl.java
index f709dd5..2195be9 100644
--- a/src/main/java/com/zy/api/service/impl/HWmsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HWmsApiServiceImpl.java
@@ -519,12 +519,12 @@
@Override
public XSR getStockInfo(PageRequestParams params) {
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- if (!Objects.isNull(params.getPro_id())) {
- wrapper.eq("supp_code", params.getPro_id());
- }
- if (!Objects.isNull(params.getPro_komcode())) {
- wrapper.eq("matnr", params.getPro_komcode());
- }
+// if (!Objects.isNull(params.getPro_id())) {
+// wrapper.eq("supp_code", params.getPro_id());
+// }
+// if (!Objects.isNull(params.getPro_komcode())) {
+// wrapper.eq("matnr", params.getPro_komcode());
+// }
Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), wrapper);
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 32d122c..43830e0 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -1,13 +1,38 @@
package com.zy.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.service.WcsApiService;
+import com.zy.asrs.entity.BasDevice;
+import com.zy.asrs.entity.LocAroundBind;
+import com.zy.asrs.service.BasDeviceService;
+import com.zy.asrs.service.LocAroundBindService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.common.constant.MesConstant;
+import com.zy.common.utils.HttpHandler;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
@Service
public class WcsApiServiceImpl implements WcsApiService {
+ @Autowired
+ private BasDeviceService basDeviceService;
+ @Autowired
+ private LocAroundBindService locAroundBindService;
+ @Autowired
+ private LocMastService locMastService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -17,7 +42,61 @@
* @return com.core.common.R
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R lockLocs(ReceviceTaskParams params) {
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
+ .eq("status", 1)
+ .eq("dev_no", params.getDeviceNo()));
+ if (Objects.isNull(basDevice)) {
+ throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
+ }
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
+ if (Objects.isNull(binds) || binds.isEmpty()) {
+ throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
+ }
+ Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+
+ reportLockLocs(locs);
+
+ return R.ok("涓婃姤鎴愬姛锛侊紒");
+ }
+
+ /**
+ * 鎼繍鍥炲簱鎸囦护
+ * @author Ryan
+ * @date 2026/1/10 13:11
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R backLocs(ReceviceTaskParams params) {
return null;
}
+
+ /**
+ * 涓婃姤閿佸畾搴撲綅淇℃伅
+ * @author Ryan
+ * @date 2026/1/10 12:50
+ * @param locs
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void reportLockLocs(Set<String> locs) {
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(MesConstant.LOCK_LOCS_URL)
+ .setJson(JSON.toJSONString(locs))
+ .build()
+ .doPost();
+ R result = JSON.parseObject(response, R.class);
+
+ if (result.get("code").equals("200")) {
+ //TODO 涓婃姤鏄惁鎴愬姛
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index 0fc2f46..20ffdca 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -14,6 +14,10 @@
public static final String PAKOUT_URL = "wmsFinprd/api/zy/v1/packOut/sendList";
+ /***涓婃姤MES锛岄攣瀹氬悓杈瑰簱浣�*/
+ public static final String LOCK_LOCS_URL = "";
+
+
/**
* token閫氳繃header浼犻�掔殑鍚嶇О
*/
--
Gitblit v1.9.1