From 5b6fb24f831898d0534a67a54f273f7b89683d73 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:38:25 +0800
Subject: [PATCH] #入库流程回调参数修改
---
src/main/java/com/zy/asrs/entity/GetWmsDto.java | 8 ++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 2 --
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++--------
src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java | 10 +++++++++-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6e3ff59..f25afd6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -246,8 +246,6 @@
return R.error("浠诲姟鍙蜂负绌猴紒");
} else if (Cools.isEmpty(param.getTaskType())){
return R.error("浠诲姟绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWarehouseId())){
- return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
}
if (Cools.isEmpty(param.getTaskPriority())){
param.setTaskPriority(1);
diff --git a/src/main/java/com/zy/asrs/entity/GetWmsDto.java b/src/main/java/com/zy/asrs/entity/GetWmsDto.java
index 8e8cf4e..f73c71d 100644
--- a/src/main/java/com/zy/asrs/entity/GetWmsDto.java
+++ b/src/main/java/com/zy/asrs/entity/GetWmsDto.java
@@ -17,4 +17,12 @@
private Integer taskTunnel; //浠诲姟宸烽亾
private String createTime; //鍒涘缓鏃堕棿 YYYY-MM-DD HH24:MI:SS
private String targetLocationCode; //鐩爣璐т綅
+
+ //浠诲姟鍙�
+ private String wrkNo;
+ //绔欑偣缂栧彿
+ private Integer staNo;
+ //鐩爣搴撲綅
+ private String locNo;
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
index ab073ad..c0c9225 100644
--- a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
@@ -7,7 +7,14 @@
@Data
public class WMSAndAGVInterfaceParam {
- private String taskNo; //浠诲姟鍙�
+ //宸ヤ綔鍙�
+ private String taskNo;
+
+ //鍏ュ嚭搴撶被鍨�
+ private int ioType;
+
+
+ //private String taskNo; //浠诲姟鍙�
private String warehouseId; //浠撳簱鏍囪瘑
//wms鍑哄簱浠诲姟涓嬪彂鎺ュ彛
@@ -42,5 +49,6 @@
//AGV璇锋眰鍔ㄤ綔鎺ュ彛
private String requestType; //璇锋眰绫诲瀷: 1=鍙栬揣锛�2=鏀捐揣
private String wharfCode; //鐮佸ご缂栧彿
+//
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index db2aad0..8e385bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -204,7 +204,7 @@
// 鍒涙柊涓�涓叆搴撳伐浣滄。
TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getTaskNo());
if(Cools.isEmpty(taskWrk)) {
- taskWrk = createTask(getWmsDto,staProtocol.getStaNo().intValue());
+ taskWrk = createTask(getWmsDto,barcode);
if (Cools.isEmpty(taskWrk)){
log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
}else {
@@ -1124,27 +1124,26 @@
return response;
}
- private TaskWrk createTask(GetWmsDto dto, Integer staNo){
- String wcsLocNo = Utils.getWcsLocNo(dto.getTargetLocationCode());
+ private TaskWrk createTask(GetWmsDto dto, String barcode){
+ String wcsLocNo = dto.getLocNo();
if(Cools.isEmpty(wcsLocNo)){
return null;
}
Date now = new Date();
TaskWrk taskWrk = new TaskWrk();
- taskWrk.setTaskNo(dto.getTaskNo());//浠诲姟鍙�
+ taskWrk.setTaskNo(dto.getWrkNo());//浠诲姟鍙�
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
- taskWrk.setBarcode(dto.getContainerCode());//鏉＄爜
+ taskWrk.setBarcode(barcode);//鏉＄爜
LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
taskWrk.setCrnNo(locMast.getCrnNo());
- taskWrk.setTargetPoint(dto.getTargetLocationCode());
- taskWrk.setStartPoint(staNo.toString());
+ taskWrk.setTargetPoint(wcsLocNo);
+ taskWrk.setStartPoint(dto.getStaNo().toString());
if(taskWrk.getIoType() == 1){
taskWrk.setWrkSts(2);
if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
- taskWrk.setTargetPoint(wcsLocNo);//缁堢偣
taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
}
--
Gitblit v1.9.1