From 563029f1f26ef2ed46d2d3b4207cd1924b1cf63a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 14:26:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 6 +++
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++
src/main/java/com/zy/asrs/controller/WorkController.java | 8 ++++
4 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index a79ba54..837c299 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -4,6 +4,7 @@
import com.core.common.R;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
@@ -84,6 +85,13 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+ @RequestMapping("/loc/detl/adjust/start")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ public R locDetlAdjustStart(LocDetlAdjustParam param) {
+ workService.adjustLocDetl(param, getUserId());
+ return R.ok("绉诲簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
new file mode 100644
index 0000000..3a41947
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.entity.param;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/18
+ */
+public class LocDetlAdjustParam {
+
+ // 搴撲綅鍙�
+ private String locNo;
+
+ // 璋冩暣搴撳瓨鏄庣粏闆嗗悎
+ private List<LocDetlAdjust> list;
+
+ public static class LocDetlAdjust {
+
+ // 鐗╂枡鍙�
+ private String matNo;
+
+ // 鍙樻洿鏁伴噺
+ private Integer count;
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+ }
+
+ public String getLocNo() {
+ return locNo;
+ }
+
+ public void setLocNo(String locNo) {
+ this.locNo = locNo;
+ }
+
+ public List<LocDetlAdjust> getList() {
+ return list;
+ }
+
+ public void setList(List<LocDetlAdjust> list) {
+ this.list = list;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 405b4ea..c960c17 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -3,6 +3,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.common.model.LocDetlDto;
@@ -50,6 +51,11 @@
void completeWrkMast(String workNo, Long userId);
/**
+ * 搴撳瓨鏄庣粏璋冩暣
+ */
+ void adjustLocDetl(LocDetlAdjustParam param, Long userId);
+
+ /**
* 鎵嬪姩鍙栨秷宸ヤ綔妗�
*/
void cancelWrkMast(String workNo, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 768e468..b4b5928 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDetlDto;
@@ -459,6 +460,11 @@
}
@Override
+ public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+
+ }
+
+ @Override
@Transactional
public void cancelWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
--
Gitblit v1.9.1