From 2d60f9188ccc113ae8ffacbb2547a753d8556d25 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 27 四月 2026 08:52:05 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 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 6382f72..7d87df2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -365,7 +365,7 @@
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
//绉昏蛋娼滃簱浣嶅湪搴撴垨绌烘澘淇℃伅
- moveShallowLocByF(staNo, userId, dto, locMast, staDesc, now);
+ moveShallowLocByF(staNo, userId, locMast, staDesc, now);
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
@@ -430,40 +430,42 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void moveShallowLocByF(BasDevp staNo, Long userId, OutLocDto dto, LocMast locMast, StaDesc staDesc, Date now) {
- String shallowLoc = Utils.getShallowLoc(locMast.getLocNo(), MesConstant.deepRows);
- if (!Objects.isNull(shallowLoc)) {
- LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
- if (locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type) || locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
- //TODO 鍑哄簱鍓嶅垽鏂槸娴呭簱浣嶆槸鍚︽湁璐э紝濡傛灉鏈夎揣浼樺厛鐢熸垚绉诲簱浠诲姟
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(staDesc.getCrnStn(), true);
- sourceStaNo.setLocType1(locMast.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto mvDto = commonService.getLocNo(1, staNo.getDevNo(), 2, null, locTypeDto);
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(mvDto.getWorkNo());
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細11.绉诲簱浠诲姟
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(999D); // 浼樺厛绾э細13
- wrkMast.setStaNo("");
- wrkMast.setCrnNo(locNo.getCrnNo());
- //婧愬簱浣�
- wrkMast.setSourceLocNo(locNo.getLocNo()); // 婧愬簱浣�
- //鐩爣搴撲綅
- wrkMast.setLocNo(mvDto.getLocNo());
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locNo.getBarcode());
- wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨绉诲簱宸ヤ綔妗ｅけ璐ワ紝绉诲簱搴撲綅鍙凤細" + locNo.getLocNo() + "鐩爣搴撲綅鍙凤細" + dto.getLocNo());
+ public void moveShallowLocByF(BasDevp staNo, Long userId, LocMast locMast, StaDesc staDesc, Date now) {
+ if (MesConstant.deepRows.contains(locMast.getBay1())) {
+ String shallowLoc = Utils.getShallowLoc(locMast.getLocNo(), MesConstant.deepRows);
+ if (!Objects.isNull(shallowLoc)) {
+ LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type) || locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ //TODO 鍑哄簱鍓嶅垽鏂槸娴呭簱浣嶆槸鍚︽湁璐э紝濡傛灉鏈夎揣浼樺厛鐢熸垚绉诲簱浠诲姟
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(staDesc.getCrnStn(), true);
+ sourceStaNo.setLocType1(locMast.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ StartupDto mvDto = commonService.getLocNo(1, staNo.getDevNo(), 2, null, locTypeDto);
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(mvDto.getWorkNo());
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細11.绉诲簱浠诲姟
+ wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(999D); // 浼樺厛绾э細13
+ wrkMast.setStaNo("");
+ wrkMast.setCrnNo(locNo.getCrnNo());
+ //婧愬簱浣�
+ wrkMast.setSourceLocNo(locNo.getLocNo()); // 婧愬簱浣�
+ //鐩爣搴撲綅
+ wrkMast.setLocNo(mvDto.getLocNo());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locNo.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨绉诲簱宸ヤ綔妗ｅけ璐ワ紝绉诲簱搴撲綅鍙凤細" + locNo.getLocNo() + "鐩爣搴撲綅鍙凤細" + mvDto.getLocNo());
+ }
}
}
}
--
Gitblit v1.9.1