Skip to content

孙克 / smf-core

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

1

1 个父辈 8aa2b2db
内嵌 并排
正在显示 2 个修改的文件 包含 20 行增加 和 9 行删除
src/main/java/com/neotel/smfcore/core/shelf/rest/TaskShelfController.java
...@@ -149,21 +149,23 @@ public class TaskShelfController { ...@@ -149,21 +149,23 @@ public class TaskShelfController {
@AnonymousAccess @AnonymousAccess
public ResultBean putShelfFinished(HttpServletRequest request) { public ResultBean putShelfFinished(HttpServletRequest request) {
String rfid = request.getParameter("rfid"); String rfid = request.getParameter("rfid");
Integer rfidLoc = Convert.toInt(request.getParameter("rfidLoc")); Integer rfidLoc = Convert.toInt(request.getParameter("rfidLoc").toString());
String barcode = request.getParameter("barcode"); String barcode = request.getParameter("barcode");
DataLog opTask = getTask(barcode); DataLog opTask = getTask(barcode);
log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] rfidLoc["+rfidLoc+"]");
if (opTask == null) { if (opTask == null) {
log.info(" getLocation barcode[" + barcode + "],rfid[" + rfid + "] 未找到出库任务，返回条码尺寸"); log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] 未找到出库任务，返回条码尺寸");
return ResultBean.newErrorResult(301, "smfcore.task.notExist", "任务不存在"); return ResultBean.newErrorResult(301, "smfcore.task.notExist", "任务不存在");
} }
if (opTask.isFinished()) { if (opTask.isFinished()) {
log.info(" getLocation barcode[" + barcode + "],rfid[" + rfid + "] 任务已完成，返回条码尺寸"); log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] 任务已完成，返回条码尺寸");
return ResultBean.newErrorResult(302, "smfcore.task.hasEnd", "任务已完成"); return ResultBean.newErrorResult(302, "smfcore.task.hasEnd", "任务已完成");
} }
if (opTask.isCancel()) { if (opTask.isCancel()) {
log.info(" getLocation barcode[" + barcode + "],rfid[" + rfid + "] 任务已完成，任务已被取消"); log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] 任务已完成，任务已被取消");
return ResultBean.newErrorResult(303, "smfcore.task.hasCancel", "更新状态时{0}的任务[{1}]已被取消", new String[]{opTask.getBarcode(), opTask.getId()}); return ResultBean.newErrorResult(303, "smfcore.task.hasCancel", "更新状态时{0}的任务[{1}]已被取消", new String[]{opTask.getBarcode(), opTask.getId()});
} }
try { try {
...@@ -181,7 +183,7 @@ public class TaskShelfController { ...@@ -181,7 +183,7 @@ public class TaskShelfController {
opTask.setStatus(OP_STATUS.FINISHED.name()); opTask.setStatus(OP_STATUS.FINISHED.name());
taskService.removeQueueTask(opTask); taskService.removeQueueTask(opTask);
taskService.updateFinishedTask(opTask); taskService.updateFinishedTask(opTask);
log.info(" getLocation barcode[" + barcode + "],rfid[" + rfid + "] 放料完成，更新任务状态为完成"); log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] 放料完成，更新任务状态为完成");
} }
String orderNo = opTask.getSourceName(); String orderNo = opTask.getSourceName();
List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(orderNo); List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(orderNo);
...@@ -223,7 +225,7 @@ public class TaskShelfController { ...@@ -223,7 +225,7 @@ public class TaskShelfController {
if(result) { if(result) {
ResultBean.newOkResult(resultMap); ResultBean.newOkResult(resultMap);
}else{ }else{
log.info(" getLocation barcode[" + barcode + "],rfid[" + rfid + "],loc["+rfidLoc+"] 放料到料架失败，未找到锁定位置"); log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "],loc["+rfidLoc+"] 放料到料架失败，未找到锁定位置");
return ResultBean.newErrorResult(304, "smfcore.task.locNotFind", "{0}放料到料架{0}的位置{0}失败，未找到锁定位置", new String[]{opTask.getBarcode(), rfid,rfidLoc+""}); return ResultBean.newErrorResult(304, "smfcore.task.locNotFind", "{0}放料到料架{0}的位置{0}失败，未找到锁定位置", new String[]{opTask.getBarcode(), rfid,rfidLoc+""});
} }
} catch (Exception e) { } catch (Exception e) {
......
src/main/java/com/neotel/smfcore/core/shelf/util/TaskShelfUtil.java
...@@ -230,11 +230,14 @@ public class TaskShelfUtil { ...@@ -230,11 +230,14 @@ public class TaskShelfUtil {
/** /**
* 获取某个需求单已经绑定的RFID * 获取某个需求单已经绑定的RFID
* *
* @param hSerial 需求单号 * @param orderNo 需求单号
*/ */
public static List<String> getUsedRfidList(String hSerial) { public static List<String> getUsedRfidList(String orderNo) {
if(ObjectUtil.isEmpty(orderNo)){
orderNo=DEFAULT_ORDERNO;
}
List<String> usedRfidList = new ArrayList<>(); List<String> usedRfidList = new ArrayList<>();
Map<String, ShelfInfo> shelfMap = taskShelfMap.get(hSerial); Map<String, ShelfInfo> shelfMap = taskShelfMap.get(orderNo);
if (shelfMap != null) { if (shelfMap != null) {
for (ShelfInfo shelfInfo : shelfMap.values()) { for (ShelfInfo shelfInfo : shelfMap.values()) {
String realRfid = shelfInfo.getRealRfid(); String realRfid = shelfInfo.getRealRfid();
...@@ -342,6 +345,9 @@ public class TaskShelfUtil { ...@@ -342,6 +345,9 @@ public class TaskShelfUtil {
String barcode = task.getBarcode(); String barcode = task.getBarcode();
String orderNo = task.getSourceName(); String orderNo = task.getSourceName();
if(ObjectUtil.isEmpty(orderNo)){
orderNo=DEFAULT_ORDERNO;
}
String tempRfid = task.getTempRfid(); String tempRfid = task.getTempRfid();
Integer rfidLoc = task.getRfidLoc(); Integer rfidLoc = task.getRfidLoc();
Map<String, ShelfInfo> shelfMap = taskShelfMap.get(orderNo); Map<String, ShelfInfo> shelfMap = taskShelfMap.get(orderNo);
...@@ -391,6 +397,9 @@ public class TaskShelfUtil { ...@@ -391,6 +397,9 @@ public class TaskShelfUtil {
String barcode = task.getBarcode(); String barcode = task.getBarcode();
String orderNo = task.getSourceName(); String orderNo = task.getSourceName();
if(ObjectUtil.isEmpty(orderNo)){
orderNo=DEFAULT_ORDERNO;
}
Map<String, ShelfInfo> shelfMap = taskShelfMap.get(orderNo); Map<String, ShelfInfo> shelfMap = taskShelfMap.get(orderNo);
if (shelfMap != null) { if (shelfMap != null) {
//该料架是否已经绑定过 //该料架是否已经绑定过
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!