From 88155592a3433104c12880fdd6d58cee0dedd3c7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 13:35:46 +0800
Subject: [PATCH] 接收MES下发，余料回库任务
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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..9ecb781 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閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -62,17 +67,40 @@
}
/**
- * 鎼繍鍥炲簱鎸囦护
+ * 浣欐枡鍥炲簱 锛堟惉杩愪綑鏂欏洖搴擄級
* @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.getWrkCode())) {
+ throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ String wrkCode = params.getWrkCode();
+ if (wrkCode.contains("-1")) {
+ throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
+ }
+
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_code", params.getWrkCode()));
+
+ 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("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
}
+
/**
* 涓婃姤閿佸畾搴撲綅淇℃伅
* @author Ryan
--
Gitblit v1.9.1