From 61eb8dfa4ff44b539d9dd03205705270ba6e1fa7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 14:38:00 +0800
Subject: [PATCH] 库位锁定或释放 添加任务自动下发功能
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 deletions(-)
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 43830e0..ede488a 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -6,12 +6,15 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
+import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.BasDevice;
import com.zy.asrs.entity.LocAroundBind;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDeviceService;
import com.zy.asrs.service.LocAroundBindService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,8 @@
private LocAroundBindService locAroundBindService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -56,36 +61,107 @@
}
Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
- reportLockLocs(locs);
+ reportLockLocs(locs, "lock");
return R.ok("涓婃姤鎴愬姛锛侊紒");
}
/**
- * 鎼繍鍥炲簱鎸囦护
+ * 浣欐枡鍥炲簱 锛堟惉杩愪綑鏂欏洖搴擄級
* @author Ryan
- * @date 2026/1/10 13:11
+ * @date 2026/1/10 13:19
* @param params
* @return com.core.common.R
*/
@Override
- public R backLocs(ReceviceTaskParams params) {
- return null;
+ @Transactional(rollbackFor = Exception.class)
+ public R backLocs(WorkTaskParams params) {
+ if (Objects.isNull(params.getTaskNo())) {
+ throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ String wrkCode = params.getTaskNo();
+ if (wrkCode.contains("-1")) {
+ throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
+ }
+
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_code", params.getTaskNo()));
+
+ if (Objects.isNull(mast)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ if (!mast.getWrkSts().equals(103L)) {
+ throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
+ }
+ mast.setWrkSts(53L);
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
}
/**
- * 涓婃姤閿佸畾搴撲綅淇℃伅
+ * 涓嬪彂浠诲姟鑷砏CS
+ * @author Ryan
+ * @date 2026/1/10 13:58
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R pubWrkToWcs(WorkTaskParams params) {
+ if (Objects.isNull(params.getTaskNo())) {
+ return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getLocNo())) {
+ return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
+ }
+ String url = MesConstant.PUB_TASK_IN;
+ if (Objects.isNull(params.getType()) && params.getType().equals("out")) {
+ url = MesConstant.PUB_TASK_OUT;
+ }
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(url)
+ .setJson(JSON.toJSONString(params))
+ .build()
+ .doPost();
+ R result = JSON.parseObject(response, R.class);
+
+ if (result.get("code").equals("200")) {
+ //TODO 涓婃姤鏄惁鎴愬姛
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+
+
+ /**
+ * 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
* @author Ryan
* @date 2026/1/10 12:50
* @param locs
*/
+ @Override
@Transactional(rollbackFor = Exception.class)
- public void reportLockLocs(Set<String> locs) {
+ public void reportLockLocs(Set<String> locs, String type) {
+ String url = MesConstant.LOCK_LOCS_URL;
+ if (!Objects.isNull(type)) {
+ if (type.equals("release")) {
+ url = MesConstant.RELEASE_LOCS_URL;
+ }
+ }
String response;
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
- .setPath(MesConstant.LOCK_LOCS_URL)
+ .setPath(url)
.setJson(JSON.toJSONString(locs))
.build()
.doPost();
--
Gitblit v1.9.1