From 58652618b0776f3ebe271c6a0f585e4a0dc60877 Mon Sep 17 00:00:00 2001 From: dubin <bindu_bean@163.com> Date: 星期四, 25 九月 2025 16:43:16 +0800 Subject: [PATCH] 初始化 --- src/main/java/com/zy/common/web/WcsController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 8c0f725..197356e 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -315,7 +315,7 @@ return R.error("搴撳瓨娌℃湁绌烘澘"); } EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam(); - emptyPlateOutParam.setOutSite(12); + emptyPlateOutParam.setOutSite(101); emptyPlateOutParam.setLocNos(new ArrayList<String>() {{ add(locMast.getLocNo() + ""); }}); @@ -333,7 +333,7 @@ // 妫�绱㈠簱浣� List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList()); List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList()); - StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto); + StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto); int workNo = dto.getWorkNo(); Date now = new Date(); // 鐢熸垚宸ヤ綔妗� @@ -345,8 +345,8 @@ wrkMast.setIoPri(13D); // 浼樺厛绾� wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); - wrkMast.setStaNo(dto.getStaNo()); - wrkMast.setLocNo(dto.getLocNo()); + wrkMast.setStaNo(dto.getStaNo());// 鐩爣绔� + wrkMast.setLocNo(dto.getLocNo());// 鐩爣搴撲綅 wrkMast.setBarcode(barcode); // 鎵樼洏鐮� wrkMast.setFullPlt("Y"); // 婊℃澘锛歒 wrkMast.setPicking("N"); // 鎷f枡 @@ -366,6 +366,8 @@ waitPakins.forEach(waitPakin -> { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(waitPakin); + wrkDetl.setProType(waitPakin.getProType()); + wrkDetl.setTemp2(waitPakin.getTemp2()); wrkDetl.setWeight(wrkMast.getScWeight()); wrkDetl.setWrkNo(wrkMast.getWrkNo()); wrkDetl.setIoTime(wrkMast.getIoTime()); -- Gitblit v1.9.1