SMD-VL 出入库都需要库位确认

SMD-VL 增加清理确认库位功能,用于继续其他库位操作

myproject/src/main/java/com/myproject/webapp/controller/storage/VerticalBoxController.java

@@ -71,7 +71,7 @@ public class VerticalBoxController extends BaseController{
     }
 
     /**
-     * 查找下一个空位,并且点亮灯
+     * 查找所有非空库位
      */
     @RequestMapping("/service/store/vertical/storagePosList")
     @ResponseBody
@@ -82,6 +82,65 @@ public class VerticalBoxController extends BaseController{
         return notEmptyPosList;
     }
 
+    /**
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/service/store/vertical/findPosTask")
+    @ResponseBody
+    public VerticalBoxOperateBean putInToPos(HttpServletRequest request){
+        String cid = request.getParameter("cid");
+        String posName = request.getParameter("posName");
+        StoragePos hostPos = storagePosManager.getByPosName(posName);
+        if(hostPos != null && hostPos.isExpandPos()){
+            hostPos = storagePosManager.get(hostPos.getHostPosId());
+        }
+        if(hostPos == null){
+            return null;
+        }
+
+        DataLog currentTask = verticalBoxHandler.getCurrentTask(cid);
+        int taskType = StorageConstants.OP.CHECKOUT;
+        if(currentTask != null){
+            taskType = currentTask.getType();
+            //先查看是否有相同类型且库位相同的任务
+            Collection<DataLog> queueTasks = taskService.getQueueTasks();
+            for (DataLog queueTask : queueTasks) {
+                if(queueTask.getType() == currentTask.getType()){
+                    if(queueTask.getPosName().equals(posName)){
+                        currentTask = queueTask;
+                        verticalBoxHandler.updateCurrentTask(queueTask.getCid(), queueTask);
+                        break;
+                    }
+                }
+            }
+
+            if(!currentTask.getPosName().equals(posName)){
+                //库位与当前任务不一致
+                currentTask = null;
+            }
+        }
+
+
+
+        if(currentTask == null){
+            Storage storage = dataCache.getStorage(cid);
+
+            currentTask  = new DataLog();
+            currentTask.setCid(storage.getCid());
+            currentTask.setStorageId(storage.getId());
+            currentTask.setStorageName(storage.getName());
+            currentTask.setPosId(hostPos.getId());
+            currentTask.setPosName(hostPos.getPosName());
+            currentTask.setType(taskType);
+            currentTask.setStatus(StorageConstants.OP_STATUS.WAIT.name());
+            verticalBoxHandler.updateCurrentTask(cid, currentTask);
+        }
+
+        return getOperateBean(currentTask);
+    }
+
     @RequestMapping("/service/store/vertical/closeOperateWindow")
     @ResponseBody
     public void closeOperateWindow(HttpServletRequest request){
@@ -97,6 +156,15 @@ public class VerticalBoxController extends BaseController{
             }
             verticalBoxHandler.updateCurrentTask(cid, null);
             StorageDataController.addOp(cid,"closeDoor", "doit");
+
+            //如果有正在执行的任务,继续弹出
+            Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
+            for (DataLog queueTask : queueTasks) {
+                if(queueTask.isExecuting()){
+                    verticalBoxHandler.updateCurrentTask(queueTask.getCid(), queueTask);
+                    break;
+                }
+            }
         }
     }
     @RequestMapping("/service/store/vertical/putIn")
@@ -270,8 +338,6 @@ public class VerticalBoxController extends BaseController{
 
                     }
 
-
-
                 }else{
                     String msg = getText(codeBean.getErrorCode(),codeBean.getParams(),request.getLocale(),codeBean.getError());
                     return msg;
@@ -306,7 +372,10 @@ public class VerticalBoxController extends BaseController{
                 currentTask = verticalBoxHandler.getCurrentTask(cid);
             }
         }
+        return getOperateBean(currentTask);
+    }
 
+    private VerticalBoxOperateBean getOperateBean(DataLog currentTask){
         if(currentTask != null){
             VerticalBoxOperateBean operateBean = new VerticalBoxOperateBean();
             operateBean.setCurrentTask(currentTask);

myproject/src/main/webapp/WEB-INF/pages/storage/verticalBox.jsp

@@ -154,8 +154,12 @@
                         <span class="help-block red" id="msg"></span>
                     </div>
                     <div class="col-md-12" >
-                        <input type="text" class="form-control" id="posConfirm" placeholder="库位确认"/>
-                        <span class="help-block red"></span>
+                        <%--<input type="text" class="form-control" id="posConfirm" placeholder="库位确认"/>--%>
+                        <%--<span class="help-block red"></span>--%>
+                        <div class="editable-input" style="position: relative;width:100%;margin-bottom:10px;">
+                            <input type="text" class="form-control" style="padding-right: 24px;" id="posConfirm" placeholder="库位确认">
+                            <span class="editable-clear-x" onclick="clearPosName();"></span>
+                        </div>
                     </div>
 
                     <div class="col-md-12">
@@ -499,7 +503,15 @@
             });
         })
 
+        clearPosName = function(){
+            $("#posConfirm").removeAttr("disabled");
+            $("#posConfirm").val("");
+            $("#putInExtendPosList").html("");
+            $("#posConfirm").attr("name", "newPosName");
+        }
+
         function showOperateWindow(task, extendPosList){
+            if($("#posConfirm").attr("name") != "newPosName"){
                 if(task.putInTask){
                     //入库任务
                     $("#operateHead").attr("class","modal-header bg-green-haze");
@@ -507,8 +519,8 @@
                 }else{
                     $("#operateHead").attr("class","modal-header bg-yellow");
                     $("#operateTitle").text("出库");
-                $("#posConfirm").val(task.posName);
-                $("#posConfirm").attr("disabled", true);
+                    //$("#posConfirm").val(task.posName);
+                    //$("#posConfirm").attr("disabled", true);
                     $("#scan-code").removeAttr("disabled");
                 }
 
@@ -531,6 +543,8 @@
                     var trStr = "<tr>" + tdStr+ "</tr>";
                     $("#putInExtendPosList").append(trStr);
                 }
+            }
+
 
             $("#operateWindow").modal("show");
             var confirmDisabled = $("#posConfirm").is(":disabled");
@@ -543,12 +557,17 @@
 
         $("#posConfirm").change(function () {
             var posValue = $(this).val();
-            var currentOperatePos = $("#currentOperatePos").text();
-            if(posValue == currentOperatePos){
-                $(this).attr("disabled", true);
+            $.post("${ctx}/service/store/vertical/findPosTask", {cid: '${show}', posName: posValue},  function (data) {
+                if(!data){
+                    showOpResult("msg","未找到对应的库位");
+                }else{
+                    $("#scan-code").val("");
+                    $("#posConfirm").attr("disabled", true);
+                    $("#posConfirm").removeAttr("name");
+                    $("#msg").html("");
                     $("#scan-code").removeAttr("disabled");
                 }
-            //showOperateWindow();
+            });
         });
 
         function showOpResult(id, msg){

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -26,6 +26,8 @@
                     <div class="timeline-content">
                         <ul>
                             <li>版本 V20200927</li>
+                            <li>SMD-VL 出入库都需要库位确认</li>
+                            <li>SMD-VL 增加清理确认库位功能,用于继续其他库位操作</li>
                             <li>Fixed: 查找出库页面不刷新时出库,会创建无物料任务的问题</li>
                         </ul>
                     </div>