From 94e4a7598d2ed0bee320174bcd44a3844d59cc0d Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 27 十二月 2023 19:25:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OpenController.java | 184 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 149 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 8c15105..58ca066 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,19 +1,22 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; +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.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; import lombok.extern.slf4j.Slf4j; 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 @@ -21,7 +24,7 @@ @Slf4j @RestController @RequestMapping("open/asrs") -public class OpenController { +public class OpenController extends BaseController { private static final boolean auth = true; public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{ @@ -30,52 +33,154 @@ @Autowired private OpenService openService; + @Autowired + private MatService matService; - /** - * 娣诲姞鍏ュ簱鍗� - */ - @PostMapping("/order/pakin/new/default/v1") - public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param) { - auth(appkey, param); + @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); } - if (Cools.isEmpty(param.getOrderNo())) { - return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderType())) { - return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderDetails())) { - return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖"); - } - openService.pakinOrderCreate(param); + openService.syncMat(param); return R.ok(); } /** - * 鍏ュ簱鍗曞洖鍐� + * 娣诲姞鍏ュ簱鍗� */ - @PostMapping("/order/pakin/complete/default/v1") - public synchronized R orderComplete(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderCompleteParam param) { - auth(appkey, param); - return R.ok().add(openService.pakinOrderComplete(param)); + @PostMapping("/order/pakin/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱") + public synchronized R pakinOrderCreate(@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); + } + + + OpenOrderPakinParam param = new OpenOrderPakinParam(param1); + openService.pakinOrderCreate(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/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱") + public synchronized R pakoutOrderCreate(@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("鍗曟嵁绫诲瀷[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(); + } + + /** * 搴撳瓨缁熻 */ @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) { - log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(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; } @@ -85,6 +190,13 @@ if (!APP_KEY_LIST.contains(appkey)) { throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�"); } + } + + /******************************************************* 鏁板瓧瀛敓 *******************************************************/ + + @PostMapping("/wrkdetl") + public R getInOutDetl(){ + return openService.getInOutDetl(); } public static void main(String[] args) { @@ -101,10 +213,12 @@ switch (i) { case 0: detlDto.setMatnr("MDH020030530"); + detlDto.setBatch("500"); detlDto.setAnfme(18.0); break; case 1: detlDto.setMatnr("MDH020016416"); + detlDto.setBatch("500"); detlDto.setAnfme(32.0); break; case 2: -- Gitblit v1.9.1