From b95e9c40e9be4eb00f1dfaded1250f479ede382e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 23 十二月 2023 11:49:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 78 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d252ad8..c4489ad 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,8 +4,10 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -14,10 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -34,6 +33,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private MatService matService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -54,21 +55,41 @@
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
+ @RequestBody OpenOrderPakinJDParam param1,
HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ auth(appkey, param1, request);
+ if (Cools.isEmpty(param1)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
+ if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param1.getMatList())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ for (OpenOrderPakinJDParam.DetlDto2 detlDto2:param1.getMatList()){
+ Mat mat = matService.selectByMatnr(detlDto2.getMatnr());
+ if (Cools.isEmpty(mat)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("matnr", detlDto2.getMatnr());
+ map.put("maktx", detlDto2.getMaktx());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
+ result.add(map);
+ }
+ }
+ if (!Cools.isEmpty(result) && result.size()!=0){
+ return R.error("璇峰厛涓嬪彂浠ヤ笅鍟嗗搧淇℃伅锛�").add(result);
+ }
+
+
+ OpenOrderPakinParam param = new OpenOrderPakinParam(param1);
openService.pakinOrderCreate(param);
return R.ok();
}
@@ -78,7 +99,7 @@
* */
@PostMapping("/digital/twin/inventory/quantity")
public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
- HttpServletRequest request) {
+ HttpServletRequest request) {
auth(appkey, null, request);
return R.ok(openService.inventoryQuantity());
}
@@ -87,7 +108,7 @@
* */
@PostMapping("/digital/ownerAll/number/quantity")
public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
- HttpServletRequest request) {
+ HttpServletRequest request) {
auth(appkey, null, request);
return openService.ownerAllNumber();
}
@@ -99,21 +120,40 @@
@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
+ @RequestBody OpenOrderPakinJDParam param1,
HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
+ auth(appkey, param1, request);
+ if (Cools.isEmpty(param1)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param1.getFormId())) {
+ return R.error("鍗曟嵁绫诲瀷[FormId]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param1.getCreateDate())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ for (OpenOrderPakinJDParam.DetlDto2 detlDto2:param1.getMatList()){
+ Mat mat = matService.selectByMatnr(detlDto2.getMatnr());
+ if (Cools.isEmpty(mat)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("matnr", detlDto2.getMatnr());
+ map.put("maktx", detlDto2.getMaktx());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
+ result.add(map);
+ }
+ }
+ if (!Cools.isEmpty(result) && result.size()!=0){
+ return R.error("璇峰厛涓嬪彂浠ヤ笅鍟嗗搧淇℃伅锛�").add(result);
+ }
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam(param1);
+
openService.pakoutOrderCreate(param);
return R.ok();
}
--
Gitblit v1.9.1