Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7c935ae2 由 zshaohui
选项

smdxl优化

1 个父辈 8cbe2b2c
内嵌 并排
正在显示 7 个修改的文件 包含 63 行增加 和 36 行删除
myproject/src/main/java/com/myproject/webapp/controller/storage/SmdXLController.java
...@@ -168,7 +168,7 @@ public class SmdXLController extends BaseController{ ...@@ -168,7 +168,7 @@ public class SmdXLController extends BaseController{
putInTask.setCid(currentTask.getCid()); putInTask.setCid(currentTask.getCid());
putInTask.setStorageId(currentTask.getStorageId()); putInTask.setStorageId(currentTask.getStorageId());
putInTask.setStorageName(currentTask.getStorageName()); putInTask.setStorageName(currentTask.getStorageName());
putInTask.setSubSourceId("1"); putInTask.setSubSourceId(doorInfo);
putInTask.setPosId(currentTask.getPosId()); putInTask.setPosId(currentTask.getPosId());
putInTask.setPosName(currentTask.getPosName()); putInTask.setPosName(currentTask.getPosName());
putInTask = dataLogDao.save(putInTask); putInTask = dataLogDao.save(putInTask);
...@@ -409,27 +409,27 @@ public class SmdXLController extends BaseController{ ...@@ -409,27 +409,27 @@ public class SmdXLController extends BaseController{
public VerticalBoxOperateBean currentTask(HttpServletRequest request) { public VerticalBoxOperateBean currentTask(HttpServletRequest request) {
String cid = request.getParameter("cid"); String cid = request.getParameter("cid");
DataLog currentTask = smdXlBoxHandler.getCurrentTask(cid); DataLog currentTask = smdXlBoxHandler.getCurrentTask(cid);
if(dataCache.getSettings().isDebugTest()){ // if(dataCache.getSettings().isDebugTest()){
if(currentTask == null){ // if(currentTask == null){
//测试使用 // //测试使用
Collection<DataLog> queueTasks = taskService.getQueueTasks(cid); // Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
for (DataLog queueTask : queueTasks) { // for (DataLog queueTask : queueTasks) {
StoragePos pos = storagePosManager.get(queueTask.getPosId()); // StoragePos pos = storagePosManager.get(queueTask.getPosId());
if(pos.isExpandPos()){ // if(pos.isExpandPos()){
continue; // continue;
} // }
if(!queueTask.isSingleOut()){ // if(!queueTask.isSingleOut()){
queueTask.setSingleOut(true); // queueTask.setSingleOut(true);
queueTask.setStatus(StorageConstants.OP_STATUS.FINISHED.name()); // queueTask.setStatus(StorageConstants.OP_STATUS.FINISHED.name());
queueTask = dataLogDao.save(queueTask); // queueTask = dataLogDao.save(queueTask);
taskService.moveTaskToFinished(queueTask); // taskService.moveTaskToFinished(queueTask);
smdXlBoxHandler.updateCurrentTask(queueTask.getCid(), queueTask); // smdXlBoxHandler.updateCurrentTask(queueTask.getCid(), queueTask);
break; // break;
} // }
} // }
currentTask = smdXlBoxHandler.getCurrentTask(cid); // currentTask = smdXlBoxHandler.getCurrentTask(cid);
} // }
} // }
if(currentTask != null){ if(currentTask != null){
VerticalBoxOperateBean operateBean = new VerticalBoxOperateBean(); VerticalBoxOperateBean operateBean = new VerticalBoxOperateBean();
operateBean.setCurrentTask(currentTask); operateBean.setCurrentTask(currentTask);
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -1889,6 +1889,14 @@ public class TaskService implements ITaskService { ...@@ -1889,6 +1889,14 @@ public class TaskService implements ITaskService {
Barcode barcode = storagePos.getBarcode(); Barcode barcode = storagePos.getBarcode();
if (barcode == null) { if (barcode == null) {
log.warn("任务:" + task.getId() + " 仓位:" + task.getPosId() + " 的 Barcode 为null, 之前可能处理过直接返回"); log.warn("任务:" + task.getId() + " 仓位:" + task.getPosId() + " 的 Barcode 为null, 之前可能处理过直接返回");
storagePos.setBarcode(null);
storagePos.setUsed(false);
storagePosManager.save(storagePos);
//记录日志
task.setStatus(StorageConstants.OP_STATUS.FINISHED.name());
dataLogDao.save(task);
theFinishedTaskMap.put(task.getId(), task);
return; return;
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/boxHandler/SmdXlBoxHandler.java
...@@ -43,18 +43,36 @@ public class SmdXlBoxHandler { ...@@ -43,18 +43,36 @@ public class SmdXlBoxHandler {
/** /**
* 获取当前正在执行的任务 * 获取当前正在执行的任务
*/ */
public DataLog getCurrentTask(String cid){ public DataLog getCurrentTask(String cid) {
if (operateTaskMap.get(cid) == null) {
DataLog task = null;
for (Map.Entry<String, DataLog> taskEntry : operateTaskMap.entrySet()) {
if (taskEntry.getKey().contains(cid)) {
task = taskEntry.getValue();
break;
}
}
if (task != null) {
operateTaskMap.remove(cid + task.getId());
operateTaskMap.put(cid, task);
}
}
return operateTaskMap.get(cid); return operateTaskMap.get(cid);
} }
/** /**
* 更新或清理(task为null)当前正在执行的任务 * 更新或清理(task为null)当前正在执行的任务
*/ */
public void updateCurrentTask(String cid, DataLog task){ public void updateCurrentTask(String cid, DataLog task) {
if(task == null){ if (task == null) {
operateTaskMap.remove(cid); operateTaskMap.remove(cid);
}else{ } else {
operateTaskMap.put(cid, task); //判断是否存在
String newKey = cid;
if (operateTaskMap.get(cid) != null) {
newKey = cid + task.getId();
}
operateTaskMap.put(newKey, task);
} }
} }
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
$("#btn"+ids[i]).attr("disabled","true"); $("#btn"+ids[i]).attr("disabled","true");
$("#check"+ids[i]).parent().attr("class","hide"); $("#check"+ids[i]).parent().attr("class","hide");
} }
$.post("${ctx}/service/store/checkout.html", {pids: posId,single:'${singleOut}'}, function (data) { $.post("${ctx}/service/store/checkout.html", {pids: posId,single:'${singleOut}',forceOut:true}, function (data) {
alert(data); alert(data);
}); });
} }
......
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
...@@ -161,10 +161,10 @@ ...@@ -161,10 +161,10 @@
<div class="bg-primary kabanTitle col-md-12"> <div class="bg-primary kabanTitle col-md-12">
<%--<span><fmt:message key="allBoxView.kanban"/></span>--%> <%--<span><fmt:message key="allBoxView.kanban"/></span>--%>
<%--<span style="margin-left: 40px;" id="storageTotalPos">总容量:1000</span>--%> <%--<span style="margin-left: 40px;" id="storageTotalPos">总容量:1000</span>--%>
<div class="col-md-6"> <%--<div class="col-md-6">
<button class="btn yellow outBtn" id="outPn"><i class="fa fa-upload"></i><fmt:message key="button.checkout"/></button> <button class="btn yellow outBtn" id="outPn"><i class="fa fa-upload"></i><fmt:message key="button.checkout"/></button>
<button class="btn yellow outBtn" id="outOrder"><i class="fa fa-folder"></i><fmt:message key="menu.order"/></button> <button class="btn yellow outBtn" id="outOrder"><i class="fa fa-folder"></i><fmt:message key="menu.order"/></button>
</div> </div>--%>
<div class="col-md-6"> <div class="col-md-6">
<div id="lineMsg"></div> <div id="lineMsg"></div>
</div> </div>
......
myproject/src/main/webapp/WEB-INF/pages/storage/smdXl.jsp
...@@ -669,7 +669,8 @@ ...@@ -669,7 +669,8 @@
} }
exePutIn = function(){ exePutIn = function(){
$.post("${ctx}/service/store/xl/exePutIn", {cid: '${show}'}, function (data) { var doorInfo = $("#doorInfo").val();
$.post("${ctx}/service/store/xl/exePutIn", {cid: '${show}',door:doorInfo}, function (data) {
//$("#operateWindow").modal("hide"); //$("#operateWindow").modal("hide");
}); });
}; };
...@@ -684,7 +685,7 @@ ...@@ -684,7 +685,7 @@
function showPutInWindow(door){ function showPutInWindow(door){
$.post("${ctx}/service/store/saveOp", {opKey: "openDoor", cid: '${show}', opValue:door}, function (data) { $.post("${ctx}/service/store/saveOp", {opKey: "openDoor", cid: '${show}', opValue:door}, function (data) {
$("#boxMsg").text(""); $("#boxMsg").text("");
$("#boxCode").text(""); $("#boxCode").val("");
$("#doorInfo").val(door); $("#doorInfo").val(door);
$("#doorTitle").text(door + "号门"); $("#doorTitle").text(door + "号门");
$("#putInWindow").modal("show"); $("#putInWindow").modal("show");
...@@ -713,7 +714,8 @@ ...@@ -713,7 +714,8 @@
$("#operateTitle").text(task.subSourceId+"号门入库"); $("#operateTitle").text(task.subSourceId+"号门入库");
}else{ }else{
$("#operateHead").attr("class","modal-header bg-yellow"); $("#operateHead").attr("class","modal-header bg-yellow");
$("#operateTitle").text("出库"); $("#operateTitle").text(task.subSourceId+"出库");
$("#doorInfo").val(task.subSourceId);
} }
$("#putInExtendPosList").html(""); $("#putInExtendPosList").html("");
...@@ -740,7 +742,6 @@ ...@@ -740,7 +742,6 @@
var trStr = "<tr class='"+hasOutTaskClass+"'>" + tdStr+ "</tr>"; var trStr = "<tr class='"+hasOutTaskClass+"'>" + tdStr+ "</tr>";
$("#putInExtendPosList").append(trStr); $("#putInExtendPosList").append(trStr);
} }
$("#operateWindow").modal("show"); $("#operateWindow").modal("show");
$("#scan-code").focus(); $("#scan-code").focus();
} }
......
pom.xml
...@@ -789,7 +789,7 @@ ...@@ -789,7 +789,7 @@
<jdbc.password>123456</jdbc.password> <jdbc.password>123456</jdbc.password>
<jdbc.validationQuery><![CDATA[SELECT 1 + 1]]></jdbc.validationQuery> <jdbc.validationQuery><![CDATA[SELECT 1 + 1]]></jdbc.validationQuery>
<mongo.host>127.0.0.1</mongo.host> <mongo.host>127.0.0.1</mongo.host>
<mongo.dbname>boshi</mongo.dbname> <mongo.dbname>storage</mongo.dbname>
<mongo.username></mongo.username> <mongo.username></mongo.username>
<mongo.password></mongo.password> <mongo.password></mongo.password>
</properties> </properties>
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
<jdbc.password>123456</jdbc.password> <jdbc.password>123456</jdbc.password>
<jdbc.validationQuery><![CDATA[SELECT 1 + 1]]></jdbc.validationQuery> <jdbc.validationQuery><![CDATA[SELECT 1 + 1]]></jdbc.validationQuery>
<mongo.host>127.0.0.1</mongo.host> <mongo.host>127.0.0.1</mongo.host>
<mongo.dbname>boshi</mongo.dbname> <mongo.dbname>storage</mongo.dbname>
<mongo.username></mongo.username> <mongo.username></mongo.username>
<mongo.password></mongo.password> <mongo.password></mongo.password>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!