From 24d7a5efb26424da1a8bf5d87db87558a6bb3a79 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 24 八月 2025 16:53:47 +0800
Subject: [PATCH] 入库空托盘，异常去异常口显示报警信息,给空工作明细
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 801fecd..a8fc86e 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1772,7 +1772,7 @@
WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkDetl1 != null) {
// 鍑哄簱浠诲姟鐨勫洓涓嚭搴撶珯鐐癸紝鍒ゆ柇褰撳墠鐗╂枡涓�鎵瑰嚭搴撶殑鏃堕棿 鑾峰彇褰撳墠宸插畬鎴� / 鎬绘暟
- if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 ||wrkMast.getStaNo() == 1040 ||wrkMast.getStaNo() == 1043 ||wrkMast.getStaNo() == 1016) ) {
+ if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 ||wrkMast.getStaNo() == 1031 ||wrkMast.getStaNo() == 1043 ||wrkMast.getStaNo() == 1016) ) {
int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101).eq("io_time", wrkMast.getIoTime()));
int countHis = wrkMastMapper.selectCountHisByIoTypeAndIoTime(101, wrkMast.getIoTime());
matDto.setOutTotal(count+countHis);
@@ -1787,6 +1787,11 @@
matDto.setWeight(wrkDetl1.getWeight());
matDto.setGrossWeight(wrkDetl1.getManLength());
ledCommand.getMatDtos().add(matDto);
+ } else {
+ // 鍏ュ簱绌烘墭鐩橈紝寮傚父鍘诲紓甯稿彛鏄剧ず鎶ヨ淇℃伅,缁欑┖宸ヤ綔鏄庣粏
+ if(wrkMast.getIoType() == 3) {
+ ledCommand.getMatDtos().add(matDto);
+ }
}
// 璁㈠崟
// if(wrkDetl1 != null && !Cools.isEmpty(wrkDetl1.getOrderNo())) {
--
Gitblit v1.9.1