From 222d6e2c408fafde98216b20bf8b5a8b2d20bcb2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 15 四月 2022 13:09:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java | 2 ++
src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++++++++----
src/main/java/com/zy/asrs/controller/MobileController.java | 7 ++++++-
4 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b1c6b18..421c7d2 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
@@ -94,7 +95,11 @@
if (wrkMast != null && wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (!Cools.isEmpty(wrkDetls)) {
- return R.ok().add(wrkDetls);
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setStaNo(staNo);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
}
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
index e8ac96a..87f9c6f 100644
--- a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
@@ -13,6 +13,8 @@
private Integer staNo;
+ private Integer wrkNo;
+
private List<WrkDetl> wrkDetls;
}
diff --git a/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java b/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java
new file mode 100644
index 0000000..53616e9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.entity.result;
+
+import com.zy.asrs.entity.WrkDetl;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/13
+ */
+@Data
+public class MobileAdjustResult {
+
+ private Integer staNo;
+
+ private Integer wrkNo;
+
+ private List<WrkDetl> wrkDetls;
+
+}
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 c63041b..1e4e4fd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,10 +4,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.*;
@@ -37,6 +34,8 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private BasDevpService basDevpService;
@Override
@Transactional
@@ -144,6 +143,13 @@
@Override
public void adjust(MobileAdjustParam param, Long userId) {
+ BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ if (null == basDevp || basDevp.getWrkNo() == null) {
+ throw new CoolException(param.getStaNo() + "鐩樼偣绔欐棤鏁�");
+ }
+ if (!param.getWrkNo().equals(basDevp.getWrkNo())) {
+ throw new CoolException(param.getStaNo() + "鐩樼偣绔欐洿鏂帮紝璇烽噸鏂版绱�");
+ }
}
--
Gitblit v1.9.1