From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期四, 24 三月 2022 12:59:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/zy/cloud/wms/common/service/MainService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java index d3e184d..ec44a62 100644 --- a/src/main/java/zy/cloud/wms/common/service/MainService.java +++ b/src/main/java/zy/cloud/wms/common/service/MainService.java @@ -538,6 +538,7 @@ tab.setPrior(false); tab.setPrior$("脳"); tab.setType(0); + tab.setWaveId(waveStoDto.getOrderNo()); res.add(tab); } @@ -562,6 +563,7 @@ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr())); tab.setPrior$(tab.getPrior()?"鉁�":"脳"); tab.setType(1); + tab.setWaveId(waveStoDto.getOrderNo()); res.add(tab); // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 issued = issued - locDetl.getAnfme(); -- Gitblit v1.9.1