From 5fb5b6883895eed6b79a9b20a8bff748134e9cfb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b61788a..58ca066 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 = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -63,12 +64,35 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
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();
@@ -109,12 +133,32 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[FormId]涓嶈兘涓虹┖");
}
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);
--
Gitblit v1.9.1