From dd2096e88fc4b44c7d40ffab90719a695dd56b4e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 08:33:20 +0800
Subject: [PATCH] 设备执行状态 回写
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5fc61d0..eebde6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1483,7 +1483,6 @@
LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
.in("loc_no", locs)
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
- .eq("dev_no", basDevice.getDevNo())
.orderAsc(Arrays.asList("loc_no"))
.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
@@ -1494,9 +1493,8 @@
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(),1);
//TODO 1. 鑾峰彇鍏ュ簱绔欑偣锛� 鐩爣搴撲綅 3. 灏嗗嚭搴撴槑缁嗘坊鍔犺嚦鍏ュ簱鏄庣粏
Integer staNo = staNos.stream().findFirst().get();
- WrkMast wrkMast = new WrkMast();
- if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (Objects.isNull(outMast.getWrkCode())) {
throw new CoolException("鏁版嵁閿欒锛屼笂绾т换鍔＄紪鐮佷负绌猴紒锛�");
}
String wrkCode;
@@ -1507,6 +1505,7 @@
} else {
throw new CoolException("鏁版嵁閿欒锛屼笂绾т换鍔＄紪鐮侀敊璇紒锛�");
}
+ WrkMast wrkMast = new WrkMast();
// 鐢熸垚宸ヤ綔妗�
wrkMast.setWrkNo(workNo);
wrkMast.setWrkCode(wrkCode);
@@ -1514,8 +1513,8 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setCrnNo(locMasts.getCrnNo());
- wrkMast.setSourceStaNo(outMast.getSourceStaNo());
- wrkMast.setStaNo(staNo + "");
+ wrkMast.setSourceStaNo(outMast.getStaNo());
+// wrkMast.setStaNo(staNo + "");
wrkMast.setLocNo(locMasts.getLocNo());
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setBarcode(outMast.getBarcode()); // 鎵樼洏鐮�
@@ -1550,7 +1549,7 @@
} else {
throw new CoolException(locMasts.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrkNo", outMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", outMast.getWrkNo()));
if (Objects.isNull(wrkDetls) || wrkDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
}
--
Gitblit v1.9.1