From d8c9b9afb41c368a08d7e05d0f624c98bf72042a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 11:18:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 261 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0f94938..6cdf87b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,35 +1,145 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.OpenService;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
*/
+@Slf4j
@RestController
-@RequestMapping("open/asrs/")
-public class OpenController {
+@RequestMapping("open/asrs")
+public class OpenController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
@Autowired
- private OrderService orderService;
+ private OpenService openService;
+
@Autowired
- private OrderDetlService orderDetlService;
+ private ConfigService configService;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Deprecated
+ @PostMapping("/grouping")
+ @AppAuth(memo = "AGV缁勬墭璋冪敤")
+ public synchronized R grouping(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) AgvGroupingParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.getOrderNo())) {
+ param.setOrderNo(param.getBillNo());
+ }
+ List<AgvGroupingParam.CombMat> combMats = param.getCombMats();
+ combMats.forEach(elem -> {
+ if (Cools.isEmpty(elem.getBatch())) {
+ elem.setBatch(elem.getItemBatch());
+ }
+ });
+
+ return openService.grouping(param);
+ }
+
+ @PostMapping("/barcodeVerificatio")
+ @AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
+ public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String, String> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+
+ // 鎵樼洏鏉＄爜
+ String barcode = param.get("barcode");
+ if (Cools.isEmpty(barcode)) {
+ return R.parse("鏉＄爜涓嶈兘涓虹┖");
+ }
+
+ return openService.barcodeVerificatio(barcode);
+ }
+
+ @PostMapping("/outbound")
+ @AppAuth(memo = "MES璋冪敤鍑哄簱")
+ public synchronized R outbound(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OutBoundParam param,
+ HttpServletRequest request) {
+ Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
+ if (mesAuto != null && mesAuto.getValue().equals("0")) {
+ return R.parse("鍏抽棴鑷姩鍑哄簱");
+ }
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return openService.outbound(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);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }
+
+ /****************************************************************************/
+ /********************************* 鎵撳寘涓婄嚎 **********************************/
+ /****************************************************************************/
+
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("order/pakin/default/v1")
- public synchronized R orderCreate(@RequestBody OpenOrderPakinParam param) {
+ @PostMapping("/order/pakin/default/v1")
+ public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -37,18 +147,149 @@
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]閿欒");
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order)) {
- return R.error(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
-
+ //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,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakinOrderComplete(param));
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
+ }
+ 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.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,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok().add(openService.queryStock());
+ }
+
+
+ /**
+ * 杩斿洖搴撳瓨鍒╃敤鐜�
+ */
+ @Synchronized
+ @PostMapping("/stock/used/v1")
+ public R getRate(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
+ int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", Arrays.asList("D", "F", "P", "Q", "R", "S")));
+ BigDecimal dividend = new BigDecimal(i1 - i);
+ BigDecimal divisor = new BigDecimal(i1);
+ BigDecimal quotient = dividend.divide(divisor,4, BigDecimal.ROUND_HALF_UP);
+ return R.ok().add(quotient);
+ }
+
+
+ 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;
+ }
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
+
+// public static void main(String[] args) {
+// // 1
+// System.out.println("======================================");
+// OpenOrderPakinParam param = new OpenOrderPakinParam();
+// param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+// param.setOrderType("鎵撳寘涓婄嚎鍗�");
+// param.setOrderTime(DateUtils.convert(new Date()));
+// List<DetlDto> orderDetails = new ArrayList<>();
+// param.setOrderDetails(orderDetails);
+// for (int i = 0; i < 3; i++) {
+// DetlDto detlDto = new DetlDto(locDto);
+// 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:
+// detlDto.setMatnr("LSH90152025");
+// detlDto.setAnfme(50.0);
+// break;
+// default:
+// break;
+// }
+// orderDetails.add(detlDto);
+// }
+// System.out.println(JSON.toJSONString(param));
+// // 2
+// System.out.println("======================================");
+// OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+// param1.setOrderNo("963001846497017856");
+// System.out.println(JSON.toJSONString(param1));
+// }
}
--
Gitblit v1.9.1