Skip to content

孙克 / changZhouShelf

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

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

1 个父辈 92ee3ce0
内嵌 并排
正在显示 9 个修改的文件 包含 26 行增加 和 18 行删除
myproject/src/main/java/com/myproject/bean/Language.java
...@@ -6,11 +6,12 @@ package com.myproject.bean; ...@@ -6,11 +6,12 @@ package com.myproject.bean;
*/ */
public enum Language { public enum Language {
//英语
ENGLISH("en","English"),
//zh_CN 中文 //zh_CN 中文
ZH_CN("zh-CN","中文"), ZH_CN("zh-CN","中文"),
//英语
ENGLISH("en","English"),
; ;
private Language(String value, String label) { 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 { ...@@ -42,7 +42,7 @@ public class User extends BaseObject implements Serializable, UserDetails {
private Long id; private Long id;
@NotBlank @NotBlank
private String username; // required private String username; // required
private String password; // required private String password = "123456"; // required
private String confirmPassword; private String confirmPassword;
private String passwordHint; private String passwordHint;
@NotBlank @NotBlank
......
myproject/src/main/java/com/myproject/webapp/controller/storage/SzShelfController.java
...@@ -172,10 +172,12 @@ public class SzShelfController extends BaseController { ...@@ -172,10 +172,12 @@ public class SzShelfController extends BaseController {
closeLight(storage, lockPos.getPosName()); closeLight(storage, lockPos.getPosName());
taskService.addTaskToFinished(lockPos,null,splice.getLineNo()+"-op"); taskService.addTaskToFinished(lockPos,null,splice.getLineNo()+"-op");
return;
} else{ } else{
log.error(splice.getKey() + "锁定条码["+lockBarcode+"]与接料条码["+spliceReelBar+"]不匹配"); log.error(splice.getKey() + "锁定条码["+lockBarcode+"]与接料条码["+spliceReelBar+"]不匹配");
} }
}else{ }
//else{
//有接料信息,且库中有此物料,但没有锁定,直接出库 //有接料信息,且库中有此物料,但没有锁定,直接出库
String reelId = splice.getReelbar(); String reelId = splice.getReelbar();
//取后13 位 //取后13 位
...@@ -187,7 +189,7 @@ public class SzShelfController extends BaseController { ...@@ -187,7 +189,7 @@ public class SzShelfController extends BaseController {
}else{ }else{
log.info("未找到接料信息息"+splice.getKey()+"对应的料物:" + splice.getReelbar()); log.info("未找到接料信息息"+splice.getKey()+"对应的料物:" + splice.getReelbar());
} }
} //}
} }
} }
...@@ -271,7 +273,7 @@ public class SzShelfController extends BaseController { ...@@ -271,7 +273,7 @@ public class SzShelfController extends BaseController {
if ("red".equalsIgnoreCase(statusLightColor)) { if ("red".equalsIgnoreCase(statusLightColor)) {
colorStr = colorStr + "=twinkle"; colorStr = colorStr + "=twinkle";
} }
newRemainingTime.setShelfLoc(lockPos.getPosName()); newRemainingTime.setShelfLoc(lockPos.getShortPosName());
newRemainingTime.setColorClass(statusLightColor); newRemainingTime.setColorClass(statusLightColor);
newRemainingTime.setLockPos(lockPos); newRemainingTime.setLockPos(lockPos);
......
myproject/src/main/java/com/myproject/webapp/controller/user/UserUpdateController.java
...@@ -120,7 +120,7 @@ public class UserUpdateController extends BaseUpdateController { ...@@ -120,7 +120,7 @@ public class UserUpdateController extends BaseUpdateController {
} }
userManager.saveUser(user); userManager.saveUser(user);
saveMessage(request, getText("user.saveSuccess", request.getLocale())); saveMessage(request, getText("user.saveSuccess", request.getLocale()));
return "redirect:userUpdate.html?id="+user.getId(); return getSuccessView();
}else if(super.isDelete(request)){ }else if(super.isDelete(request)){
userManager.removeUser(user); userManager.removeUser(user);
//saveMessage(request, getText("user.deleteSuccess", request.getLocale())); //saveMessage(request, getText("user.deleteSuccess", request.getLocale()));
......
myproject/src/main/resources/StorageResources.properties
...@@ -238,6 +238,7 @@ user.role=Role ...@@ -238,6 +238,7 @@ user.role=Role
user.language=Language user.language=Language
user.email=Email user.email=Email
user.authCode=Auth Code user.authCode=Auth Code
exist.user.authCode=The authorization code already exists
user.writeCard=Write Card user.writeCard=Write Card
user.profile.edit=Profile Edit user.profile.edit=Profile Edit
profile.password.subtitle=Password Change profile.password.subtitle=Password Change
......
myproject/src/main/resources/StorageResources_en.properties
...@@ -238,6 +238,7 @@ user.role=Role ...@@ -238,6 +238,7 @@ user.role=Role
user.language=Language user.language=Language
user.email=Email user.email=Email
user.authCode=Auth Code user.authCode=Auth Code
exist.user.authCode=The authorization code already exists
user.writeCard=Write Card user.writeCard=Write Card
user.profile.edit=Profile Edit user.profile.edit=Profile Edit
profile.password.subtitle=Password Change profile.password.subtitle=Password Change
......
myproject/src/main/resources/StorageResources_zh_CN.properties
...@@ -238,6 +238,7 @@ user.role=\u89D2\u8272 ...@@ -238,6 +238,7 @@ user.role=\u89D2\u8272
user.language=\u8BED\u8A00 user.language=\u8BED\u8A00
user.email=\u90AE\u7BB1 user.email=\u90AE\u7BB1
user.authCode=\u6388\u6743\u7801 user.authCode=\u6388\u6743\u7801
exist.user.authCode=\u6388\u6743\u7801\u5DF2\u5B58\u5728
user.writeCard=\u5199\u5165\u5361\u7247 user.writeCard=\u5199\u5165\u5361\u7247
user.profile.edit=\u8D44\u6599\u7F16\u8F91 user.profile.edit=\u8D44\u6599\u7F16\u8F91
profile.password.subtitle=\u4FEE\u6539\u5BC6\u7801 profile.password.subtitle=\u4FEE\u6539\u5BC6\u7801
......
myproject/src/main/webapp/WEB-INF/pages/user/userUpdate.jsp
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<c:if test="${user.id == null}"> <c:if test="${user.id == null}">
<label class="control-label col-md-2"><fmt:message key="user.initPwd"/></label> <label class="control-label col-md-2"><fmt:message key="user.initPwd"/></label>
<div class="col-md-3"> <div class="col-md-3">
<p class="form-control-static">Acc123&nbsp;&nbsp;&nbsp; <p class="form-control-static">123456&nbsp;&nbsp;&nbsp;
</p> </p>
</div> </div>
</c:if> </c:if>
...@@ -112,14 +112,16 @@ ...@@ -112,14 +112,16 @@
<div class="form-group"> <div class="form-group">
<form:errors path="email" cssStyle="display: none"> <%--<form:errors path="email" cssStyle="display: none">--%>
<c:set var="emailErrorClass" value="has-error"/> <%--<c:set var="emailErrorClass" value="has-error"/>--%>
</form:errors> <%--</form:errors>--%>
<label class="control-label col-md-2"><fmt:message key="user.email"/><span class="required"> * </span></label> <%--<label class="control-label col-md-2"><fmt:message key="user.email"/><span class="required"> * </span></label>--%>
<div class="col-md-3 ${emailErrorClass}"> <%--<div class="col-md-3 ${emailErrorClass}">--%>
<form:input type="text" path="email" class="form-control"/> <%--<form:input type="text" path="email" class="form-control"/>--%>
<form:errors path="email" cssClass="help-block"/> <%--<form:errors path="email" cssClass="help-block"/>--%>
</div> <%--</div>--%>
<input name="email" type="hidden" value="test@test.com">
<label class="control-label col-md-2">授权码</label> <label class="control-label col-md-2">授权码</label>
<div class="col-md-3"> <div class="col-md-3">
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -356,13 +356,13 @@ ...@@ -356,13 +356,13 @@
jQuery(document).ready(function() { jQuery(document).ready(function() {
$(':text,:password').keyboard({ $(':text,:password,textarea').keyboard({
openOn : null, openOn : null,
stayOpen : true, stayOpen : true,
layout : 'qwerty' layout : 'qwerty'
}); });
$(':text,:password').each(function(){ $(':text,:password,textarea').each(function(){
var textDom = $(this); var textDom = $(this);
var kbicon=$('<span class="input-group-addon"><i class="fa fa-keyboard-o" name="amount"></i></span>'); var kbicon=$('<span class="input-group-addon"><i class="fa fa-keyboard-o" name="amount"></i></span>');
kbicon.click(function(){ kbicon.click(function(){
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!