From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 23 十月 2024 14:37:04 +0800
Subject: [PATCH] 测试环境暂时注释
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index e9fa509..1c35546 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -276,6 +276,7 @@
String matnr = params.get("matnr");
String floor = params.get("floor");
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", matnr));
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
@@ -294,7 +295,7 @@
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
} else {
// 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
- if ("JG".equals(orderNo.substring(0,2))) {
+ if (orderDetl.getSource().equals(35)) {
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
} else {
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
@@ -372,9 +373,7 @@
- if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
- && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
- || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
+ if((!Cools.eq("F",agvLocMastByLocNo.getLocSts())
&& !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){
return R.error("搴撲綅鐘舵�佷笉涓篎鎴栬�匘锛屾棤娉曠淮鎶�");
@@ -427,7 +426,13 @@
}
if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
- return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ //agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ //agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
+ //return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ return R.ok("缁存姢鎴愬姛");
}
@@ -696,6 +701,7 @@
return R.ok();
}
+
public static void main(String[] args) {
List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
--
Gitblit v1.9.1