From 2a8fbec7b091f5f0b9b45f9a6afa07f3547b4e68 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 28 五月 2024 16:49:10 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java | 2
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/MatParam.java | 22 +++++++++++
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/OrderParam.java | 18 +++++++++
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 52 +++++++++++++++++++++++--
4 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
index 61cd550..c93aa6f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
@@ -10,7 +10,7 @@
private String orderNo;
- private String orderType;
+ private Integer orderType;
private String orderTime;
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
index 4716cb8..da21b6e 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.openapi.entity.HostKey;
import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
-import com.zy.asrs.common.openapi.entity.param.CreateMatParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
-import com.zy.asrs.common.openapi.entity.param.OrderListParam;
+import com.zy.asrs.common.openapi.entity.param.*;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.openapi.service.HostKeyService;
import com.zy.asrs.common.web.BaseController;
@@ -19,12 +16,14 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.openapi.param.MatParam;
+import com.zy.asrs.openapi.param.OrderParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -170,6 +169,49 @@
@PostMapping("order/execute/auth/v1")
public R wms1(@RequestBody Map<String, Object> map) {
log.info("order/execute/auth/v1锛�" + JSON.toJSONString(map));
+ OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
+ List<DocType> list = apiService.getOrderType();
+ DocType type = null;
+ for (DocType docType : list) {
+ if (docType.getDocName().equals(orderParam.getOrderType())) {
+ type = docType;
+ break;
+ }
+ }
+ if (type == null) {
+ return R.error("鍗曟嵁绫诲瀷涓嶅瓨鍦�");
+ }
+
+ ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
+ for (MatParam matParam : orderParam.getList()) {
+ GenerateOrderMatParam mat = new GenerateOrderMatParam();
+ mat.setMatnr(matParam.getMatnr());
+ mat.setBatch(matParam.getBatch());
+ mat.setAnfme(matParam.getCount());
+ mats.add(mat);
+ }
+
+ if (orderParam.getInOut() == 1) {
+ //鍏ュ簱
+ GenerateOrderPakInParam param = new GenerateOrderPakInParam();
+ param.setHostId(1L);
+ param.setOrderType(type.getDocId().intValue());
+ param.setOrderNo(orderParam.getOrderNo());
+ param.setMats(mats);
+ apiService.generateOrderPakIn(param);
+ } else if (orderParam.getInOut() == 2) {
+ //鍑哄簱
+ GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
+ param.setHostId(1L);
+ param.setOrderType(type.getDocId().intValue());
+ param.setOrderNo(orderParam.getOrderNo());
+ param.setMats(mats);
+ apiService.generateOrderPakOut(param);
+ }else {
+ //鍏朵粬
+ return R.error("鍑哄叆搴撶被鍨嬮敊璇�");
+ }
+
return R.ok();
}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/MatParam.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/MatParam.java
new file mode 100644
index 0000000..b7c2cb2
--- /dev/null
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/MatParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.openapi.param;
+
+import lombok.Data;
+
+@Data
+public class MatParam {
+
+ private String matnr;//鐗╂枡缂栧彿
+
+ private String batch;//鎵瑰彿
+
+ private Double count;//鏁伴噺
+
+ private String unit;//鍗曚綅
+
+ private String warehouse;//浠撳簱鍙�
+
+ private String origin;//鏉ユ簮鍗曞彿
+
+ private String originNo;//鏉ユ簮搴忓彿
+
+}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/OrderParam.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/OrderParam.java
new file mode 100644
index 0000000..7c7a88f
--- /dev/null
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/OrderParam.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.openapi.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderParam {
+
+ private String orderType;//鍗曟嵁绫诲瀷
+
+ private Integer inOut;//鍗曟嵁鍑哄叆搴�
+
+ private String orderNo;//鍗曟嵁缂栧彿
+
+ private List<MatParam> list;//鏄庣粏
+
+}
--
Gitblit v1.9.1