From c1702cc51a4d94ed37d5083494c87fe0f2cbe5b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 10:20:13 +0800
Subject: [PATCH] # 销售单取消后回滚立库出库至A99
---
src/main/java/zy/cloud/wms/manager/controller/OpenController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
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 cd9390a..5eb24d4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -11,8 +11,13 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import zy.cloud.wms.common.entity.Parameter;
+import zy.cloud.wms.common.model.ErpUpload;
+import zy.cloud.wms.common.model.param.ReplenishDto;
import zy.cloud.wms.common.model.param.ReplenishParam;
+import zy.cloud.wms.common.service.erp.ErpService;
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;
@@ -30,7 +35,7 @@
*/
@RestController
@RequestMapping("/open/api")
-public class OpenController {
+public class OpenController extends BaseController {
@Autowired
private PriorService priorService;
@@ -40,15 +45,23 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private ErpService erpService;
+
+ @PostMapping("/erp/upload")
+ public R erpUpload(@RequestBody ErpUpload erpUpload){
+ Boolean result = erpService.uploadBill(erpUpload.getDtos(), erpUpload.getDocId(), erpUpload.getDocNumber());
+ return result ? R.ok() : R.error();
+ }
@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()));
// 鏈夋帹鑽愯揣浣�
@@ -80,7 +93,7 @@
// 娌℃湁鎺ㄨ崘璐х墿
} else {
- Node node = nodeService.selectByUuid("A00"); // todo
+ Node node = nodeService.selectByUuid(Parameter.get().getUniNode());
LocDetl locDetl = locDetlService.getLocDetl(node.getId(), param.getMatnr());
if (locDetl == null) {
--
Gitblit v1.9.1