From be554d9e52799a0ee14c98b0959d07ab3847c8e6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 15:24:27 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/OpenController.java | 174 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..6cdf87b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,31 @@
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.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
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.model.DetlDto;
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.*;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -33,11 +43,70 @@
@Autowired
private OpenService openService;
+ @Autowired
+ 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){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -83,7 +152,7 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
- openService.pakinOrderCreate(param);
+ //openService.pakinOrderCreate(param);
return R.ok();
}
@@ -151,6 +220,25 @@
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);
@@ -165,43 +253,43 @@
}
}
- 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();
- 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));
- }
+// 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