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 | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ea6ca84..197356e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -96,6 +96,12 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+ try {
+ // 寤惰繜 3 绉掑啀妫�娴�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
@@ -309,7 +315,7 @@
return R.error("搴撳瓨娌℃湁绌烘澘");
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(12);
+ emptyPlateOutParam.setOutSite(101);
emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
add(locMast.getLocNo() + "");
}});
@@ -327,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();
// 鐢熸垚宸ヤ綔妗�
@@ -339,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"); // 鎷ｆ枡
@@ -360,6 +366,9 @@
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());
wrkDetl.setAppeTime(now);
@@ -372,11 +381,14 @@
wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
- wrkDetl.setLuHao(orderDetl.getLuHao());
+// wrkDetl.setLuHao(orderDetl.getLuHao());
+ wrkDetl.setSupp(orderDetl.getSupp());
+ wrkDetl.setSuppCode(orderDetl.getSuppCode());
wrkDetl.setPacking(orderDetl.getPacking());
wrkDetl.setColor(orderDetl.getColor());
wrkDetl.setWareId(orderDetl.getWareId());
wrkDetl.setWareName(orderDetl.getWareName());
+ wrkDetl.setTemp1(orderDetl.getTemp1());
}
}
if (!wrkDetlService.insert(wrkDetl)) {
--
Gitblit v1.9.1