From f6e687c194354f1c0b883b5ac56da3a8e70db471 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 18:43:37 +0800
Subject: [PATCH] 出库工作档功能优化
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 a6cc1f8..15e3030 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -11,10 +11,7 @@
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.asrs.service.*;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +35,8 @@
private LocMastService locMastService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -76,26 +75,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R backLocs(WorkTaskParams params) {
- if (Objects.isNull(params.getTaskNo())) {
+ if (Objects.isNull(params.getWrkNo())) {
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()));
-
+// String wrkCode = params.getTaskNo();
+// if (wrkCode.contains("-1")) {
+// throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
+// }
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
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("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
+// if (!mast.getWrkSts().equals(103L)) {
+// throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
+// }
+// if (params.getIsSuplus() == 1) {
+// mast.setIsSuplus(1);
+// }
+//
+// if (!wrkMastService.updateById(mast)) {
+// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+ workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
}
--
Gitblit v1.9.1