From 67826a2c51bbc013db409dd1a5e29dd4ba52fd72 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 09:27:47 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/common/web/WcsController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 34d9402..f6c7e8e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -107,11 +107,23 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("5")){
+ locTypeDto.setLocType2((short) 5); // 2000*1500*170 1宸烽亾 4銆�5灞�
+ }else if (param.getBarcode().startsWith("6")){
+ locTypeDto.setLocType2((short) 6); // 1500*1500*170(鏈変袱绉� 鎵樼洏涓�鏍� 杞介噸涓嶄竴鏍� 闇�瑕佸崟鐙牴鎹� 鎵樼洏鐮� + 楂樹綆 鏉ュ啓鍒嗗簱浣嶇殑閫昏緫) 1宸烽亾 1銆�2銆�3灞�
+ }else if (param.getBarcode().startsWith("7")){
+ locTypeDto.setLocType2((short) 7); // 2600*1500*160 2宸烽亾 1銆�2灞�
+ }else if (param.getBarcode().startsWith("8")){
+ locTypeDto.setLocType2((short) 8); // 1300*1500*160 2宸烽亾 3銆�4銆�5銆�6灞�
+ }else {
+ return R.error("鏉＄爜瑙勫垯涓嶅瓨鍦�:"+param.getBarcode());
+ }
+
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), param.getWeight(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -315,7 +327,7 @@
return R.error("搴撳瓨娌℃湁绌烘澘");
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
- emptyPlateOutParam.setOutSite(12);
+ emptyPlateOutParam.setOutSite(101);
emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
add(locMast.getLocNo() + "");
}});
@@ -333,7 +345,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 +357,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"); // 鎷ｆ枡
@@ -366,10 +378,14 @@
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);
wrkDetl.setModiTime(now);
+ wrkDetl.setModel(waitPakin.getModel());
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
@@ -379,11 +395,13 @@
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
// wrkDetl.setLuHao(orderDetl.getLuHao());
- wrkDetl.setWeight(weight);
+ 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