From 570300c26ff3c562c03ac24e4896f72d33fa4369 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 18 七月 2025 14:23:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 81 +++++++++++++++++++++-------------------
src/main/java/com/zy/asrs/controller/MobileController.java | 17 ++++----
2 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c3ea41f..8462d00 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -150,7 +150,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
- logger.info("缁勬墭鍙傛暟锛歿}",combParam);
+ logger.info("缁勬墭鍙傛暟锛歿}", combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -495,6 +495,7 @@
return R.ok().add(wrkMastArrayList);
}
+
@RequestMapping("/pick/mat/list")
@ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
@@ -559,11 +560,11 @@
public R orderListorderNo(@RequestParam String orderNo) {
//鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
List<OrderDetl> orderDetl1 = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("orderNo", orderNo));
- List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
- for (OrderDetl o: orderDetl1) {
- BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ List<OrderDetl> orderDetls = new ArrayList<OrderDetl>();
+ for (OrderDetl o : orderDetl1) {
+ BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
o.setAnfme(c1.doubleValue());
- if (o.getAnfme().equals(0.0)){
+ if (o.getAnfme().equals(0.0)) {
continue;
}
orderDetls.add(o);
@@ -604,12 +605,12 @@
.in("order_id", orderIds)
.like("order_no", orderNo)
);
- if (Cools.isEmpty(orderDetlList)){
+ if (Cools.isEmpty(orderDetlList)) {
return R.error("鏈煡璇㈠埌姝よ鍗曟鐗╂枡鏁版嵁");
}
ArrayList<OrderDetl> orderDetls = new ArrayList<>();
- for(OrderDetl orderDetl:orderDetlList){
+ for (OrderDetl orderDetl : orderDetlList) {
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (count <= 0D) {
continue;
@@ -629,7 +630,7 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- return mobileService.WarehouseOutPickMergeV1(param,getUserId());
+ return mobileService.WarehouseOutPickMergeV1(param, getUserId());
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9506aae..ab2c05a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,8 +7,10 @@
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.web.BaseController;
@@ -23,6 +25,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,6 +50,9 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private LocDetlService locDetlService;
@Deprecated
@PostMapping("/grouping")
@@ -241,6 +247,43 @@
}
+ @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());
+ 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);
+ }
+
+
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);
@@ -255,43 +298,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