Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit aaa753c4 由 张少辉
选项

T开头的库位,截取前3位传过去

1 个父辈 34533d33
内嵌 并排
正在显示 1 个修改的文件 包含 21 行增加 和 9 行删除
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -3,6 +3,7 @@ package com.myproject.webapp.controller.webService; ...@@ -3,6 +3,7 @@ package com.myproject.webapp.controller.webService;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.*; import com.google.common.collect.*;
import com.mongodb.util.JSON;
import com.myproject.bean.CodeBean; import com.myproject.bean.CodeBean;
import com.myproject.bean.json.LiteOrder; import com.myproject.bean.json.LiteOrder;
import com.myproject.bean.json.LiteOrderItem; import com.myproject.bean.json.LiteOrderItem;
...@@ -1651,7 +1652,15 @@ public class TaskService implements ITaskService { ...@@ -1651,7 +1652,15 @@ public class TaskService implements ITaskService {
} }
postOutNotification(dataCache.getSettings().getOutNotifyApi(), task.getBarcode(), task.getCid(),task.getCheckType(),workOrderNumber); postOutNotification(dataCache.getSettings().getOutNotifyApi(), task.getBarcode(), task.getCid(),task.getCheckType(),workOrderNumber);
}else{ }else{
postInNotification(dataCache.getSettings().getInNotifyApi(), task.getBarcode(), task.getStorageId(),task.getCheckType(),task.getWorkOrderNumber()); String loc = task.getCid();
String posName = task.getPosName();
if (StringUtils.isNotEmpty(posName) && posName.length() >= 3){
if(posName.startsWith("T")) {
loc = posName.substring(0, 3);
}
}
log.info(task.getBarcode()+":对应的库位信息为:"+loc);
postInNotification(dataCache.getSettings().getInNotifyApi(), task.getBarcode(), loc,task.getCheckType(),task.getWorkOrderNumber());
} }
} }
...@@ -1763,7 +1772,7 @@ public class TaskService implements ITaskService { ...@@ -1763,7 +1772,7 @@ public class TaskService implements ITaskService {
Storage storage = dataCache.getStorage(task.getCid()); Storage storage = dataCache.getStorage(task.getCid());
if(storage != null){ if(storage != null){
postInNotification(dataCache.getSettings().getInNotifyApi(), task.getBarcode(), task.getStorageId(),task.getCheckType(),task.getWorkOrderNumber()); postInNotification(dataCache.getSettings().getInNotifyApi(), task.getBarcode(), task.getCid(),task.getCheckType(),task.getWorkOrderNumber());
} }
...@@ -1776,7 +1785,7 @@ public class TaskService implements ITaskService { ...@@ -1776,7 +1785,7 @@ public class TaskService implements ITaskService {
theFinishedTaskMap.put(task.getId(),task); theFinishedTaskMap.put(task.getId(),task);
} }
private boolean postInNotification(String url, String reelBarcode, String storageId,String checkType,String workOrderNumber){ private boolean postInNotification(String url, String reelBarcode, String loc,String checkType,String workOrderNumber){
try { try {
if(Strings.isNullOrEmpty(url)){ if(Strings.isNullOrEmpty(url)){
...@@ -1786,7 +1795,7 @@ public class TaskService implements ITaskService { ...@@ -1786,7 +1795,7 @@ public class TaskService implements ITaskService {
Barcode barcode = barcodeManager.findByBarcode(reelBarcode); Barcode barcode = barcodeManager.findByBarcode(reelBarcode);
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("ri",reelBarcode); params.put("ri",reelBarcode);
params.put("loc",storageId); params.put("loc",loc);
params.put("warehouseId","SG00001"); params.put("warehouseId","SG00001");
params.put("workNo",workOrderNumber); params.put("workNo",workOrderNumber);
params.put("storageType",""); params.put("storageType","");
...@@ -1834,15 +1843,18 @@ public class TaskService implements ITaskService { ...@@ -1834,15 +1843,18 @@ public class TaskService implements ITaskService {
if (StringUtils.isNotEmpty(checkType)) { if (StringUtils.isNotEmpty(checkType)) {
if (checkType.contains("发2003")) { if (checkType.contains("发2003")) {
params.put("storageType", "10"); params.put("storageType", "10");
} else if (checkType.contains("2003退库")) { } else if (checkType.contains("发2006")) {
params.put("storageType", "20"); params.put("storageType", "20");
} else if (checkType.contains("2006退库")) { } else if (checkType.contains("退主仓")) {
params.put("storageType", "30"); params.put("storageType", "30");
} }
} }
params.put("workNo",workOrderNumber); params.put("workNo",workOrderNumber);
log.info("请求参数为: "+ JSON.serialize(params));
String result = HttpHelper.get(url,params); String result = HttpHelper.get(url,params);
log.info("收到MES ["+ url+"]的关于["+reelBarcode+"]出库通知的反馈信息:"+result); log.info("收到MES ["+ url+"]的关于["+reelBarcode+"]出库通知的反馈信息:"+result);
return true; return true;
...@@ -1902,9 +1914,9 @@ public class TaskService implements ITaskService { ...@@ -1902,9 +1914,9 @@ public class TaskService implements ITaskService {
//通知消息 //通知消息
Storage storage = dataCache.getStorage(task.getCid()); Storage storage = dataCache.getStorage(task.getCid());
if(storage != null){ if(storage != null){
String workOrderNumber = task.getWorkOrderNumber(); String workOrderNumber = "";
if (StringUtils.isEmpty(workOrderNumber)){ if(StringUtils.isEmpty(task.getWorkOrderNumber())){
workOrderNumber = task.getWorkOrderNumber(); workOrderNumber = task.getSourceName();
} }
postOutNotification(dataCache.getSettings().getOutNotifyApi(), task.getBarcode(), task.getCid(),task.getCheckType(),workOrderNumber); postOutNotification(dataCache.getSettings().getOutNotifyApi(), task.getBarcode(), task.getCid(),task.getCheckType(),workOrderNumber);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!