From 369d64e49980d910414a7efe486d72dfc230cde4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 28 五月 2021 11:00:04 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/model/param/ReplenishParam.java | 6 +++---
src/main/java/zy/cloud/wms/manager/controller/OpenController.java | 18 +++++++-----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/model/param/ReplenishParam.java b/src/main/java/zy/cloud/wms/common/model/param/ReplenishParam.java
index b529089..965c404 100644
--- a/src/main/java/zy/cloud/wms/common/model/param/ReplenishParam.java
+++ b/src/main/java/zy/cloud/wms/common/model/param/ReplenishParam.java
@@ -2,14 +2,14 @@
import lombok.Data;
+import java.util.List;
+
/**
* Created by vincent on 2021/5/27
*/
@Data
public class ReplenishParam {
- private String matnr;
-
- private Double count;
+ private List<ReplenishDto> list;
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
index ac5f42f..7362e52 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -7,13 +7,12 @@
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.entity.Parameter;
+import zy.cloud.wms.common.model.param.ReplenishDto;
import zy.cloud.wms.common.model.param.ReplenishParam;
import zy.cloud.wms.common.utils.VersionUtils;
+import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Node;
@@ -22,7 +21,6 @@
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.PriorService;
-import zy.cloud.wms.system.service.ConfigService;
import java.util.Date;
import java.util.List;
@@ -32,7 +30,7 @@
*/
@RestController
@RequestMapping("/open/api")
-public class OpenController {
+public class OpenController extends BaseController {
@Autowired
private PriorService priorService;
@@ -42,17 +40,15 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
- @Autowired
- private ConfigService configService;
@PostMapping("/replenish")
@Transactional
- public R asrsReplenish(@RequestBody List<ReplenishParam> params){
- if (Cools.isEmpty(params)) {
+ public R asrsReplenish(@RequestBody ReplenishParam params){
+ if (Cools.isEmpty(params.getList())) {
return R.parse(BaseRes.PARAM);
}
Date now = new Date();
- for (ReplenishParam param : params) {
+ for (ReplenishDto param : params.getList()) {
Mat mat = matService.selectByMatnr(param.getMatnr());
List<Prior> priors = priorService.selectList(new EntityWrapper<Prior>().eq("matnr", param.getMatnr()));
// 鏈夋帹鑽愯揣浣�
--
Gitblit v1.9.1