From 33cb25f6fb87e7781bf5f62c7fa879db52d0715a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 08:57:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 6 +++++-
src/main/java/com/zy/common/web/WcsController.java | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bdf8dd8..cf25a2d 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -28,7 +28,11 @@
**/
public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- return dto.getLocType1().equals(loc.getLocType1());
+ boolean flag = dto.getLocType1().equals(loc.getLocType1());
+ if (flag) {
+ flag = dto.getLocType2().equals(loc.getLocType2());
+ }
+ return flag;
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 41b126b..b1bc5a0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -87,6 +87,15 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ if (param.getBarcode().startsWith("11")) {
+ locTypeDto.setLocType2((short) 1);
+ }else if (param.getBarcode().startsWith("13")) {
+ locTypeDto.setLocType2((short) 2);
+ }else if (param.getBarcode().startsWith("16")) {
+ locTypeDto.setLocType2((short) 3);
+ }else {
+ return R.error("鏈煡鎵樼洏鐮佽鍒�");
+ }
StartupDto dto = null;
switch (param.getIoType()) {
@@ -179,6 +188,9 @@
// dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
+ if (dto == null) {
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
--
Gitblit v1.9.1