有锁定信息,但物料不一致时,对有库存的信息进行清理

myproject/src/main/java/com/myproject/bean/Language.java

@@ -6,11 +6,12 @@ package com.myproject.bean;
  */
 public enum Language {
 
-    //英语
-    ENGLISH("en","English"),
     //zh_CN 中文
     ZH_CN("zh-CN","中文"),
 
+    //英语
+    ENGLISH("en","English"),
+
     ;
 
     private Language(String value, String label) {

myproject/src/main/java/com/myproject/model/User.java

@@ -42,7 +42,7 @@ public class User extends BaseObject implements Serializable, UserDetails {
     private Long id;
     @NotBlank
     private String username;                    // required
-    private String password;                    // required
+    private String password = "123456";                    // required
     private String confirmPassword;
     private String passwordHint;
     @NotBlank

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

@@ -172,10 +172,12 @@ public class SzShelfController extends BaseController {
                     closeLight(storage, lockPos.getPosName());
 
                     taskService.addTaskToFinished(lockPos,null,splice.getLineNo()+"-op");
+                    return;
                 } else{
                     log.error(splice.getKey() + "锁定条码["+lockBarcode+"]与接料条码["+spliceReelBar+"]不匹配");
                 }
-            }else{
+            }
+            //else{
                 //有接料信息,且库中有此物料,但没有锁定,直接出库
                 String reelId = splice.getReelbar();
                 //取后13 位
@@ -187,7 +189,7 @@ public class SzShelfController extends BaseController {
                 }else{
                     log.info("未找到接料信息息"+splice.getKey()+"对应的料物:" + splice.getReelbar());
                 }
-            }
+            //}
 
         }
     }
@@ -271,7 +273,7 @@ public class SzShelfController extends BaseController {
                             if ("red".equalsIgnoreCase(statusLightColor)) {
                                 colorStr = colorStr + "=twinkle";
                             }
-                            newRemainingTime.setShelfLoc(lockPos.getPosName());
+                            newRemainingTime.setShelfLoc(lockPos.getShortPosName());
                             newRemainingTime.setColorClass(statusLightColor);
                             newRemainingTime.setLockPos(lockPos);
 

myproject/src/main/java/com/myproject/webapp/controller/user/UserUpdateController.java

@@ -120,7 +120,7 @@ public class UserUpdateController extends BaseUpdateController {
                     }
                     userManager.saveUser(user);
                     saveMessage(request, getText("user.saveSuccess", request.getLocale()));
-                    return "redirect:userUpdate.html?id="+user.getId();
+                    return getSuccessView();
                 }else if(super.isDelete(request)){
                     userManager.removeUser(user);
                     //saveMessage(request, getText("user.deleteSuccess", request.getLocale()));

myproject/src/main/resources/StorageResources.properties

@@ -238,6 +238,7 @@ user.role=Role
 user.language=Language
 user.email=Email
 user.authCode=Auth Code
+exist.user.authCode=The authorization code already exists
 user.writeCard=Write Card
 user.profile.edit=Profile Edit
 profile.password.subtitle=Password Change

myproject/src/main/resources/StorageResources_en.properties

@@ -238,6 +238,7 @@ user.role=Role
 user.language=Language
 user.email=Email
 user.authCode=Auth Code
+exist.user.authCode=The authorization code already exists
 user.writeCard=Write Card
 user.profile.edit=Profile Edit
 profile.password.subtitle=Password Change

myproject/src/main/resources/StorageResources_zh_CN.properties

@@ -238,6 +238,7 @@ user.role=\u89D2\u8272
 user.language=\u8BED\u8A00
 user.email=\u90AE\u7BB1
 user.authCode=\u6388\u6743\u7801
+exist.user.authCode=\u6388\u6743\u7801\u5DF2\u5B58\u5728
 user.writeCard=\u5199\u5165\u5361\u7247
 user.profile.edit=\u8D44\u6599\u7F16\u8F91
 profile.password.subtitle=\u4FEE\u6539\u5BC6\u7801

myproject/src/main/webapp/WEB-INF/pages/user/userUpdate.jsp

@@ -59,7 +59,7 @@
               <c:if test="${user.id == null}">
                 <label class="control-label col-md-2"><fmt:message key="user.initPwd"/></label>
                 <div class="col-md-3">
-                  <p class="form-control-static">Acc123&nbsp;&nbsp;&nbsp;
+                  <p class="form-control-static">123456&nbsp;&nbsp;&nbsp;
                   </p>
                 </div>
               </c:if>
@@ -112,14 +112,16 @@
 
 
             <div class="form-group">
-              <form:errors path="email" cssStyle="display: none">
-                <c:set var="emailErrorClass" value="has-error"/>
-              </form:errors>
-              <label class="control-label col-md-2"><fmt:message key="user.email"/><span class="required"> * </span></label>
-              <div class="col-md-3 ${emailErrorClass}">
-                <form:input type="text"  path="email" class="form-control"/>
-                <form:errors path="email"  cssClass="help-block"/>
-              </div>
+              <%--<form:errors path="email" cssStyle="display: none">--%>
+                <%--<c:set var="emailErrorClass" value="has-error"/>--%>
+              <%--</form:errors>--%>
+              <%--<label class="control-label col-md-2"><fmt:message key="user.email"/><span class="required"> * </span></label>--%>
+              <%--<div class="col-md-3 ${emailErrorClass}">--%>
+                <%--<form:input type="text"  path="email" class="form-control"/>--%>
+                <%--<form:errors path="email"  cssClass="help-block"/>--%>
+              <%--</div>--%>
+
+              <input name="email" type="hidden" value="test@test.com">
 
               <label class="control-label col-md-2">授权码</label>
               <div class="col-md-3">

myproject/src/main/webapp/decorators/metro.jsp

@@ -356,13 +356,13 @@
   jQuery(document).ready(function() {
 
 
-    $(':text,:password').keyboard({
+    $(':text,:password,textarea').keyboard({
       openOn : null,
       stayOpen : true,
       layout : 'qwerty'
     });
 
-    $(':text,:password').each(function(){
+    $(':text,:password,textarea').each(function(){
       var textDom = $(this);
       var kbicon=$('<span class="input-group-addon"><i class="fa fa-keyboard-o" name="amount"></i></span>');
       kbicon.click(function(){