From 65c305f9e8af6fdb4f80b85484b1170f068aa1fa Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 10 九月 2025 10:43:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 166 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 30bd744..a43b11f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,32 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.AppAuth;
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.LocDetl;
+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.LocDto;
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.math.RoundingMode;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,12 +46,21 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ConfigService configService;
+
+ @Autowired
+ private LocMastService locMastService;
+
+ @Autowired
+ private LocDetlService locDetlService;
+
@Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) AgvGroupingParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) AgvGroupingParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param.getOrderNo())) {
param.setOrderNo(param.getBillNo());
@@ -58,37 +78,41 @@
@PostMapping("/barcodeVerificatio")
@AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String,String> param,
- HttpServletRequest request){
+ @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 R.parse("鏉＄爜涓嶈兘涓虹┖");
}
return openService.barcodeVerificatio(barcode);
}
@PostMapping("/outbound")
- @AppAuth(memo = "AGV鍑哄簱璋冪敤")
+ @AppAuth(memo = "MES璋冪敤鍑哄簱")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) List<LocDto> locDtos,
- HttpServletRequest request) throws InterruptedException {
- auth(appkey, locDtos, request);
- if (Cools.isEmpty(locDtos)) {
+ @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(locDtos);
+ 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);
@@ -202,6 +226,84 @@
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);
+ // 鍦ㄥ簱鐜�=(鎬绘暟-绌哄簱浣嶆暟)/鎬绘暟
+ BigDecimal quotient = BigDecimal.valueOf(1200 - i)
+ .divide(BigDecimal.valueOf(1200), 4, RoundingMode.HALF_UP);
+ return R.ok().add(quotient);
+ }
+
+
+ @Synchronized
+ @PostMapping("/stock/used/v3")
+ public R getRate2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) LocMast param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (param.getRow1() != null) {
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O").eq("row1", param.getRow1()));
+ int i2 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("row1", param.getRow1()));
+ // 鍦ㄥ簱鐜�=(鎬绘暟-绌哄簱浣嶆暟)/鎬绘暟
+ BigDecimal quotient = BigDecimal.valueOf(i2 - i)
+ .divide(BigDecimal.valueOf(i2), 4, RoundingMode.HALF_UP);
+ return R.ok().add(quotient);
+ } else {
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
+ int i2 = locMastService.selectCount(new EntityWrapper<LocMast>());
+ // 鍦ㄥ簱鐜�=(鎬绘暟-绌哄簱浣嶆暟)/鎬绘暟
+ BigDecimal quotient = BigDecimal.valueOf(i2 - i)
+ .divide(BigDecimal.valueOf(i2), 4, RoundingMode.HALF_UP);
+ return R.ok().add(quotient);
+ }
+ }
+
+
+ @PostMapping(value = "/loc/info")
+ @Synchronized
+ public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
+ auth(appkey, param, request);
+ LocMast locMast = locMastService.selectById(param.getLocNo());
+ if (locMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("status", locMast.getLocSts());
+ map.put("data", locDetls);
+ return R.ok(map);
+ }
+
+ @RequestMapping(value = "/locMast/sts")
+ @Synchronized
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "100000") Integer limit) {
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ Page<LocMast> locMastPage = locMastService.selectPage(new Page<>(curr, limit), wrapper);
+ List<Object> list = new ArrayList<>();
+ for (LocMast locmast : locMastPage.getRecords()) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("sts", locmast.getLocSts());
+ map.put("loc", locmast.getLocNo());
+ list.add(map);
+ }
+ return R.ok(list);
+ }
+
+
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);
@@ -216,43 +318,5 @@
}
}
-// 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