From e8727dc1615ab749a6bfbe54633f5f0fc28f370b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 25 六月 2024 12:35:16 +0800
Subject: [PATCH] led总数显示
---
src/main/java/com/zy/common/web/WcsController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d8fcf6a..f6735dc 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -109,7 +109,12 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = pltBarcodes.stream().map(PltBarcode::getMatNo).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+ StartupDto dto;
+ if (devpNo == 304) {
+ dto = commonService.getLocNoBy304(barcode);
+ } else {
+ dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -140,7 +145,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
pltBarcodes.forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), null, elem.getQty(),elem.getSource(),elem.getVendor()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor(),elem.getMemo()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
@@ -177,7 +182,12 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto,0);
+ StartupDto dto;
+ if (devpNo >= 300) {
+ dto = commonService.emptyIngetLocNo(devpNo);
+ } else {
+ dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1