From 206b3ccaf11b22acd27218b63be0e2db249fe18d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 19 三月 2024 10:46:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 217 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 160 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 19883d4..509f025 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,9 +4,10 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+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,9 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -33,107 +33,203 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private MatService matService;
-
-
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
-
-
- @PostMapping("/order/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.packageUp(barcode);
+ openService.syncMat(param);
return R.ok();
}
-
-
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
- if (Cools.isEmpty(param)) {
+ @RequestBody OpenOrderPakinJDParam param1,
+ HttpServletRequest request) {
+ 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.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
+ 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();
}
/**
- * 鍏ュ簱鍗曞洖鍐�
+ * 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
- return R.ok().add(openService.pakinOrderComplete(param));
+ @PostMapping("/order/pakmove/default/v1")
+ @AppAuth(memo = "娣诲姞璋冩嫧鍗�")
+ public synchronized R pakmoveOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinJDParam param1,
+ HttpServletRequest request) {
+ auth(appkey, param1, request);
+ if (Cools.isEmpty(param1)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ 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);
+ }
+
+
+ OpenOrderPakmoveParam param = new OpenOrderPakmoveParam(param1);
+ openService.pakmoveOrderCreate(param);
+ return R.ok();
}
+
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/twin/inventory/quantity")
+ public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok(openService.inventoryQuantity());
+ }
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/ownerAll/number/quantity")
+ public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.ownerAllNumber();
+ }
+
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
- if (Cools.isEmpty(param)) {
+ @RequestBody OpenOrderPakinJDParam param1,
+ HttpServletRequest request) {
+ 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.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ 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);
return R.ok();
}
- /**
- * 鍑哄簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakout/complete/default/v1")
- public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
- return R.ok().add(openService.pakoutOrderComplete(param));
- }
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
- return R.ok().add(openService.queryStock());
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ @RequestBody StockVo stockVo,
+ HttpServletRequest request) {
+ auth(appkey, stockVo, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
-
- private void auth(String appkey, Object obj) {
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -145,6 +241,13 @@
}
}
+ /******************************************************* 鏁板瓧瀛敓 *******************************************************/
+
+ @PostMapping("/wrkdetl")
+ public R getInOutDetl(){
+ return openService.getInOutDetl();
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
--
Gitblit v1.9.1