From e43b29a03ba1d6a5d022075daa8fc54c6f3b30c7 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期三, 26 六月 2024 17:00:36 +0800
Subject: [PATCH] 入库修改
---
src/main/java/com/zy/common/model/StartupDto.java | 3 +++
src/main/java/com/zy/common/web/WcsController.java | 12 ++++++++++--
src/main/java/com/zy/common/service/CommonService.java | 15 ++++++++++++---
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index 304aca3..1801129 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -1,8 +1,11 @@
package com.zy.common.model;
+import lombok.Data;
+
/**
* Created by vincent on 2020/6/11
*/
+@Data
public class StartupDto {
private Integer sourceStaNo;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 7aab917..ac2e0a7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -551,10 +551,19 @@
return startupDto;
}
- public StartupDto getLocNoBy304(String barcode) {
- int crnNo = 3;
+ public StartupDto getLocNoBy304(String type) {
+
+ int row;
int devpNo = 304;
- int row = barcode.charAt(0) == '5' ? 7 : 6;
+ int crnNo = 3;
+ if (type.equals("1")) {
+ row = 7;
+ } else if (type.equals("2")) {
+ row = 6;
+ } else {
+ throw new CoolException("304鐗╂枡绫诲埆璇嗗埆閿欒锛�" + type);
+ }
+
// 鐩爣搴撲綅
LocMast locMast = locMastMapper.queryLocByBarCode(row);
if (locMast == null) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 0fd99f2..022fc94 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -50,6 +50,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public R getLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -102,7 +103,7 @@
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto.toString(), param.getBarcode());
return R.ok().add(dto);
}
@@ -115,9 +116,16 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = pltBarcodes.stream().map(PltBarcode::getMatNo).distinct().collect(Collectors.toList());
+
+ // 鑾峰彇绫诲埆鏍囪瘑(1鍘熸潗鏂欙紝2鎴愬搧)
+ List<String> str5 = pltBarcodes.stream().map(PltBarcode::getStr5).distinct().collect(Collectors.toList());
+ if (str5.isEmpty() || str5.get(0) == null) {
+ throw new CoolException("鐗╂枡绫诲埆鑾峰彇澶辫触");
+ }
+
StartupDto dto;
if (devpNo == 304) {
- dto = commonService.getLocNoBy304(barcode);
+ dto = commonService.getLocNoBy304(str5.get(0));
} else {
dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
}
--
Gitblit v1.9.1