From 75cbc7ef747bc41e8f89d250e9e27742c7614da7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 十一月 2025 11:09:38 +0800
Subject: [PATCH] 空托出库默认优先级14
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 3d5ec22..1b22d48 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -116,6 +116,8 @@
private SlaveProperties slaveProperties;
@Autowired
private WaitPakinService waitPakinService;
+ @Resource
+ private OpenServiceImpl openService;
@Override
@Transactional
@@ -210,8 +212,13 @@
one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo()));
}
if (null != one && !paramLocDetl.getMatnr().equals("绌虹")) {
- if (!"鍚堟牸".equals(one.getThreeCode())) {
+ // 3077 3106 鍙湁鍚堟牸鑳藉嚭
+ if((param.getOutSite() == 3077 || param.getOutSite() == 3106) && !"鍚堟牸".equals(one.getThreeCode())) {
throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode());
+ }
+ // 2041 鍙湁寰呭垽鑳藉嚭
+ if(param.getOutSite() == 2041 && null != one.getThreeCode()) {
+ throw new CoolException(one.getModel() + "鍗蜂笉涓哄緟鍒�:" + one.getThreeCode());
}
locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
} else {
@@ -978,7 +985,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(14D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -1271,7 +1278,7 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
@@ -1279,6 +1286,8 @@
wrkMast.setWrkSts(4L);
// 鍑哄簱
} else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(workNo));
+ openService.ckjgsbPushMes(wrkMast,wrkDetls);
wrkMast.setWrkSts(14L);
} else {
throw new CoolException("褰撳墠宸ヤ綔绫诲瀷鎴栫姸鎬佹棤娉曞畬鎴�");
--
Gitblit v1.9.1