From 2d81a78ae1924b20066ae8ff9557fd4bbe6d893b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 04 二月 2026 08:38:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5ff9f70..0b018fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -66,6 +66,8 @@
@Autowired
private BasArmMastService basArmMastService;
@Autowired
+ private BasAgvLocDetlService basAgvLocDetlService;
+ @Autowired
private BasArmMastSignService basArmMastSignService;
@Autowired
private BasAgvMastService basAgvMastService;
@@ -776,7 +778,9 @@
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
// basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
+ if(!basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3)){
+ throw new CoolException("鏇存柊鐘舵��2-3鑷姩缁勬墭澶辫触"+ JSON.toJSONString(param));
+ }
}
@Override
@@ -916,6 +920,7 @@
LocDetl locDetl = locDetlService.selectOne(
wrapper.eq("zpallet", wrkDetl.getZpallet())
.eq("matnr", wrkDetl.getMatnr())
+ .eq("box_type3",wrkDetl.getBoxType3())
);
// 鍙嫞鎬婚噺锛氫紭鍏堝彇搴撳瓨琛紝鍚﹀垯鍙栦綔涓氭暟閲�
if (Cools.isEmpty(locDetl)) {
@@ -969,8 +974,8 @@
}
private AgvLocListDetlParam buildAgvLocListDetlParam(String locNo, String locSts) {
- List<LocDetl> detlList = locDetlService.selectList(
- new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ List<BasAgvLocDetl> detlList = basAgvLocDetlService.selectList(
+ new EntityWrapper<BasAgvLocDetl>().eq("loc_no", locNo)
);
AgvLocListDetlParam dto = new AgvLocListDetlParam();
--
Gitblit v1.9.1