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/service/impl/OpenServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4347bc1..45ef6a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,7 +12,7 @@
import com.zy.asrs.entity.ToWmsDTO;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.StaDescService;
@@ -31,7 +31,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
@@ -60,7 +59,7 @@
@Override
- public R taskCreate(taskCreateParam param) {
+ public R taskCreate(TaskCreateParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
@@ -95,7 +94,7 @@
}else if (param.getIoType() == 3){
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
taskWrk.setOriginStartPoint(param.getStartPoint());
}
}
@@ -150,7 +149,7 @@
,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
,null
,"127.0.0.1"
- ,JSON.toJSONString(param)
+ ,JSON.toJSONString(toWmsDTO)
,response
,true
);
@@ -162,7 +161,7 @@
WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
String msg = null;
try {
- taskCreate(new taskCreateParam(data));
+ taskCreate(new TaskCreateParam(data));
}catch (Exception e){
msg = e.getMessage();
}
@@ -175,12 +174,19 @@
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("crn_no",data.getTaskTunnel())
.eq("type_no",1)
- .lt("crn_stn",200));
+ .lt("stn_no",200));
+ }else if (param.getWharfSource().contains("H")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",data.getTaskTunnel())
+ .eq("type_no",1)
+ .lt("stn_no",400)
+ .gt("stn_no",200));
}else {
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("crn_no",data.getTaskTunnel())
.eq("type_no",1)
- .ge("crn_stn",200));
+ .lt("stn_no",500)
+ .ge("stn_no",400));
}
map1.put("taskTunnel", staDesc.getStnDesc());
//map1.put("taskTunnel", "J-1104");
--
Gitblit v1.9.1