From 9320540f7b6735d065fe3428484d5d47765dc160 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 30 十月 2025 12:54:41 +0800
Subject: [PATCH] gwms申请入库时判断卷号/箱号是否存在
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..cdb9e40 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 {
@@ -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