Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 73f763a9 由 LN
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 655516f3 cd4ae6df
内嵌 并排
正在显示 2 个修改的文件 包含 52 行增加 和 38 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java
...@@ -609,6 +609,12 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -609,6 +609,12 @@ public class BaseDeviceHandler implements IDeviceHandler {
protected void finishedOutPos(String cid, String posName,String barcode,int executeTime,OP_STATUS outBoxStatus) throws ValidateException { protected void finishedOutPos(String cid, String posName,String barcode,int executeTime,OP_STATUS outBoxStatus) throws ValidateException {
DataLog task = taskService.findExecutingTask(cid, posName,barcode); DataLog task = taskService.findExecutingTask(cid, posName,barcode);
if (task != null && task.isCheckOutTask()) { if (task != null && task.isCheckOutTask()) {
//判断状态是否重复推送
log.info(task.getBarcode()+"状态为:"+task.getStatus()+",重新更改状态:"+outBoxStatus.name());
if (outBoxStatus.name().equals(task.getStatus())){
log.info("状态一致,不处理,返回");
return;
}
if (executeTime > 0) { if (executeTime > 0) {
task.setExecuteTime(executeTime); task.setExecuteTime(executeTime);
} }
...@@ -625,6 +631,12 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -625,6 +631,12 @@ public class BaseDeviceHandler implements IDeviceHandler {
//从已完成列表中找,如果还找不到就忽略 //从已完成列表中找,如果还找不到就忽略
task = taskService.findFinishedOutTask(cid, posName,barcode); task = taskService.findFinishedOutTask(cid, posName,barcode);
if (task != null && task.isCheckOutTask()) { if (task != null && task.isCheckOutTask()) {
//判断状态是否重复推送
log.info(task.getBarcode()+"状态为:"+task.getStatus()+",重新更改状态:"+outBoxStatus.name());
if (outBoxStatus.name().equals(task.getStatus())){
log.info("状态一致,不处理,返回");
return;
}
if (task.isCancel()) {//被取消的任务,客户端发完成信号过来,修改取消状态为已完成 if (task.isCancel()) {//被取消的任务,客户端发完成信号过来,修改取消状态为已完成
if (executeTime > 0) { if (executeTime > 0) {
task.setExecuteTime(executeTime); task.setExecuteTime(executeTime);
......
src/main/java/com/neotel/smfcore/custom/sungya20456/SungyaApi.java
...@@ -259,47 +259,49 @@ public class SungyaApi extends BaseSmfApiListener { ...@@ -259,47 +259,49 @@ public class SungyaApi extends BaseSmfApiListener {
*/ */
@Override @Override
public void outTaskStatusChange(String outNotifyUrl, DataLog task) { public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
try { if (task.isOutBox() || task.isFinished()) {
Map<String, Object> paramMap = new HashMap<>(); try {
paramMap.put("funcname", "OUTWHDONE"); Map<String, Object> paramMap = new HashMap<>();
Map<String, Object> bodyMap = new HashMap<>(); paramMap.put("funcname", "OUTWHDONE");
bodyMap.put("source", "SMF"); Map<String, Object> bodyMap = new HashMap<>();
bodyMap.put("reelId", task.getBarcode()); bodyMap.put("source", "SMF");
bodyMap.put("partNum", task.getPartNumber()); bodyMap.put("reelId", task.getBarcode());
bodyMap.put("qty", task.getNum()); bodyMap.put("partNum", task.getPartNumber());
bodyMap.put("boxNo", ""); bodyMap.put("qty", task.getNum());
Storage storage = dataCache.getStorage(task.getCid()); bodyMap.put("boxNo", "");
if (storage != null) { Storage storage = dataCache.getStorage(task.getCid());
bodyMap.put("boxNo", storage.getName()); if (storage != null) {
} bodyMap.put("boxNo", storage.getName());
bodyMap.put("location", task.getPosName());
bodyMap.put("hSerial", "");
bodyMap.put("so", "");
bodyMap.put("slotNum", "");
bodyMap.put("feederInfo", "");
String sourceName = task.getSourceName();
if (StringUtils.isNotBlank(sourceName)) {
LiteOrder orderNo = liteOrderManager.findByOrderNo(sourceName);
if (orderNo != null) {
bodyMap.put("hSerial", orderNo.getOrderNo());
bodyMap.put("so", orderNo.getSo());
} }
} bodyMap.put("location", task.getPosName());
String subSourceId = task.getSubSourceId(); bodyMap.put("hSerial", "");
if (StringUtils.isNotBlank(subSourceId)) { bodyMap.put("so", "");
LiteOrderItem orderItem = liteOrderItemManager.get(subSourceId); bodyMap.put("slotNum", "");
if (orderItem != null) { bodyMap.put("feederInfo", "");
bodyMap.put("slotNum", orderItem.getSlotNum()); String sourceName = task.getSourceName();
bodyMap.put("feederInfo", orderItem.getFeederInfo()); if (StringUtils.isNotBlank(sourceName)) {
LiteOrder orderNo = liteOrderManager.findByOrderNo(sourceName);
if (orderNo != null) {
bodyMap.put("hSerial", orderNo.getOrderNo());
bodyMap.put("so", orderNo.getSo());
}
}
String subSourceId = task.getSubSourceId();
if (StringUtils.isNotBlank(subSourceId)) {
LiteOrderItem orderItem = liteOrderItemManager.get(subSourceId);
if (orderItem != null) {
bodyMap.put("slotNum", orderItem.getSlotNum());
bodyMap.put("feederInfo", orderItem.getFeederInfo());
}
} }
paramMap.put("body", bodyMap);
String requestParams = JsonUtil.toJsonStr(paramMap);
log.info(task.getBarcode() + "出库完成通知,参数" + requestParams);
String result = HttpHelper.postJson(outNotifyUrl, paramMap);
log.info(task.getBarcode() + "出库完成通知返回" + result);
} catch (ApiException e) {
e.printStackTrace();
} }
paramMap.put("body", bodyMap);
String requestParams = JsonUtil.toJsonStr(paramMap);
log.info(task.getBarcode() + "出库完成通知,参数" + requestParams);
String result = HttpHelper.postJson(outNotifyUrl, paramMap);
log.info(task.getBarcode() + "出库完成通知返回" + result);
} catch (ApiException e) {
e.printStackTrace();
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!