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 | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 197356e..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());
@@ -373,6 +385,7 @@
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) {
--
Gitblit v1.9.1