Skip to content

孙克 / SmdBox

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

Session超时时间改为30分钟,避免总是提示登陆

1 个父辈 350c94e6
内嵌 并排
正在显示 15 个修改的文件 包含 63 行增加 和 34 行删除
myproject/src/main/java/com/myproject/bean/Sequence.java
...@@ -6,7 +6,6 @@ package com.myproject.bean; ...@@ -6,7 +6,6 @@ package com.myproject.bean;
public class Sequence extends BaseMongoBean{ public class Sequence extends BaseMongoBean{
private Long seq; private Long seq;
public Long getSeq() { public Long getSeq() {
return seq; return seq;
} }
......
myproject/src/main/java/com/myproject/manager/impl/StoragePosManagerImpl.java
...@@ -442,16 +442,16 @@ public class StoragePosManagerImpl implements IStoragePosManager { ...@@ -442,16 +442,16 @@ public class StoragePosManagerImpl implements IStoragePosManager {
private Sort getSortByCheckOutType(StorageConstants.CHECKOUT_TYPE checkoutType){ private Sort getSortByCheckOutType(StorageConstants.CHECKOUT_TYPE checkoutType){
Sort sort = null; Sort sort = null;
if(StorageConstants.CHECKOUT_TYPE.EXPIRE_FIRST.equals(checkoutType)){//先过期先出 if(StorageConstants.CHECKOUT_TYPE.EXPIRE_FIRST.equals(checkoutType)){//先过期先出
sort = new Sort(Sort.Direction.ASC, "barcode.expTime").and(new Sort(Sort.Direction.ASC, "barcode.expireDate")).and(new Sort(Sort.Direction.ASC, "canCheckOutTime")); sort = new Sort(Sort.Direction.ASC, "barcode.expTime").and(new Sort(Sort.Direction.ASC, "barcode.expireDate")).and(new Sort(Sort.Direction.ASC, "barcode.putInTime"));
}else if(StorageConstants.CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出 }else if(StorageConstants.CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
sort = new Sort(Sort.Direction.ASC, "canCheckOutTime").and(new Sort(Sort.Direction.DESC, "barcode.usedCount")); sort = new Sort(Sort.Direction.ASC, "barcode.putInTime").and(new Sort(Sort.Direction.DESC, "barcode.usedCount"));
}else if(StorageConstants.CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先 }else if(StorageConstants.CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
sort = new Sort(Sort.Direction.ASC, "barcode.amount").and(new Sort(Sort.Direction.ASC, "canCheckOutTime")); sort = new Sort(Sort.Direction.ASC, "barcode.amount").and(new Sort(Sort.Direction.ASC, "barcode.putInTime"));
}else if(StorageConstants.CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){ }else if(StorageConstants.CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
//先生产先出 //先生产先出
sort = new Sort(Sort.Direction.ASC, "barcode.produceDate").and(new Sort(Sort.Direction.ASC, "canCheckOutTime")); sort = new Sort(Sort.Direction.ASC, "barcode.produceDate").and(new Sort(Sort.Direction.ASC, "barcode.putInTime"));
}else{//效率优先 }else{//效率优先
sort = new Sort(Sort.Direction.ASC, "canCheckOutTime").and(new Sort(Sort.Direction.ASC, "createDate")); sort = new Sort(Sort.Direction.ASC, "barcode.putInTime").and(new Sort(Sort.Direction.ASC, "barcode.amount"));
} }
return sort; return sort;
} }
......
myproject/src/main/java/com/myproject/util/BarcodeRule.java
...@@ -660,6 +660,8 @@ public class BarcodeRule { ...@@ -660,6 +660,8 @@ public class BarcodeRule {
codeStr = "IAC;6014A0489701;HI1206T161R-10;2047;AC20NKA0448KA;2000;VBG204768056"; codeStr = "IAC;6014A0489701;HI1206T161R-10;2047;AC20NKA0448KA;2000;VBG204768056";
rule = "SP;PN;3;PRODATEyyw;BATCH;QTY;RI"; rule = "SP;PN;3;PRODATEyyw;BATCH;QTY;RI";
codeStr = "=7x8=140032005 18B030918B 200.000 614A 0001045024 0001 20200414-141329";
rule = "PN BATCH QTY[-1:0:1] RI ";
BarcodeRule br = BarcodeRule.newRule(rule); BarcodeRule br = BarcodeRule.newRule(rule);
Barcode b = br.toCodeBean(codeStr).getBarcode(); Barcode b = br.toCodeBean(codeStr).getBarcode();
if(b != null){ if(b != null){
......
myproject/src/main/java/com/myproject/util/StorageConstants.java
...@@ -326,7 +326,7 @@ public class StorageConstants { ...@@ -326,7 +326,7 @@ public class StorageConstants {
} }
public static List<TYPE> availableTypeList(){ public static List<TYPE> availableTypeList(){
return Lists.newArrayList(AUTO,LINE,BATCH,ACCSHELF,CODESHELF,SOLDERPASTE,VERTICALBOX,SMD_XL); return Lists.newArrayList(AUTO,LINE,BATCH,ACCSHELF,CODESHELF,SOLDERPASTE,VERTICALBOX,SMD_XL,SMD_DUO);
} }
} }
......
myproject/src/main/java/com/myproject/webapp/controller/barcode/BarcodeSettingsController.java
...@@ -40,8 +40,8 @@ public class BarcodeSettingsController extends SettingsController { ...@@ -40,8 +40,8 @@ public class BarcodeSettingsController extends SettingsController {
} else { } else {
try { try {
String[] codeRuleList = request.getParameterValues("codeRuleList"); String[] codeRuleList = request.getParameterValues("codeRuleList");
if(codeRuleList.length > 10){ if(codeRuleList.length > 12){
throw new ValidateException("barcode.error.maxRule","条码规则最多只允许有10个"); throw new ValidateException("barcode.error.maxRule","条码规则最多只允许有12个");
} }
if(codeRuleList != null){ if(codeRuleList != null){
settings.setCodeRuleList(Lists.newArrayList(codeRuleList)); settings.setCodeRuleList(Lists.newArrayList(codeRuleList));
......
myproject/src/main/java/com/myproject/webapp/controller/storage/AccShelfController.java
...@@ -9,6 +9,7 @@ import com.myproject.bean.update.Barcode; ...@@ -9,6 +9,7 @@ import com.myproject.bean.update.Barcode;
import com.myproject.bean.update.DataLog; import com.myproject.bean.update.DataLog;
import com.myproject.bean.update.Storage; import com.myproject.bean.update.Storage;
import com.myproject.bean.update.StoragePos; import com.myproject.bean.update.StoragePos;
import com.myproject.bean.utils.StatusBean;
import com.myproject.dao.mongo.IDataLogDao; import com.myproject.dao.mongo.IDataLogDao;
import com.myproject.exception.ValidateException; import com.myproject.exception.ValidateException;
import com.myproject.manager.IBarcodeManager; import com.myproject.manager.IBarcodeManager;
...@@ -204,6 +205,11 @@ public class AccShelfController extends BaseController { ...@@ -204,6 +205,11 @@ public class AccShelfController extends BaseController {
return getText("shelf.msg.noTask",new String[]{inPos.getPosName()},request.getLocale(),"操作失败,已在库位["+inPos.getPosName()+"]中,未找到对应的出库任务"); return getText("shelf.msg.noTask",new String[]{inPos.getPosName()},request.getLocale(),"操作失败,已在库位["+inPos.getPosName()+"]中,未找到对应的出库任务");
} }
StatusBean status = taskService.getStatus(storage.getCid());
if(status.getStatus() == StorageConstants.STATUS.OFFLINE){
taskService.saveStatus(status);
}
List<Storage> storageList = Lists.newArrayList(storage); List<Storage> storageList = Lists.newArrayList(storage);
StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode); StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode);
int delayCloseTime = 30000; int delayCloseTime = 30000;
......
myproject/src/main/java/com/myproject/webapp/controller/storage/StorageUpdateController.java
...@@ -5,6 +5,7 @@ import com.myproject.bean.update.StoragePos; ...@@ -5,6 +5,7 @@ import com.myproject.bean.update.StoragePos;
import com.myproject.exception.ValidateException; import com.myproject.exception.ValidateException;
import com.myproject.manager.IStorageManager; import com.myproject.manager.IStorageManager;
import com.myproject.manager.IStoragePosManager; import com.myproject.manager.IStoragePosManager;
import com.myproject.util.StorageConstants;
import com.myproject.webapp.controller.webService.DataCache; import com.myproject.webapp.controller.webService.DataCache;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -46,6 +47,9 @@ public class StorageUpdateController extends BaseUpdateController { ...@@ -46,6 +47,9 @@ public class StorageUpdateController extends BaseUpdateController {
Storage storage = new Storage(); Storage storage = new Storage();
if (!isAdd(request) && StringUtils.isNotBlank(id)) { if (!isAdd(request) && StringUtils.isNotBlank(id)) {
storage = storageManager.get(id); storage = storageManager.get(id);
if(storage.isVirtual()){
storage.setType( StorageConstants.TYPE.AUTO.name());
}
} }
model.addAttribute("storage", storage); model.addAttribute("storage", storage);
...@@ -66,6 +70,9 @@ public class StorageUpdateController extends BaseUpdateController { ...@@ -66,6 +70,9 @@ public class StorageUpdateController extends BaseUpdateController {
return getSuccessView(); return getSuccessView();
} else { } else {
try { try {
if(storage.isVirtual()){
storage.setType( StorageConstants.TYPE.AUTO.name());
}
dataCache.reloadStorage(storage); dataCache.reloadStorage(storage);
//fileUpload.setParam(storage.getId()); //fileUpload.setParam(storage.getId());
saveMessage(request, getText("storage.saveSuccess", request.getLocale())); saveMessage(request, getText("storage.saveSuccess", request.getLocale()));
......
myproject/src/main/java/com/myproject/webapp/controller/webService/ITaskService.java
...@@ -21,6 +21,8 @@ import java.util.Map; ...@@ -21,6 +21,8 @@ import java.util.Map;
public interface ITaskService { public interface ITaskService {
StatusBean saveStatus(StatusBean statusBeanToSave);
/** /**
* 取消单个任务 * 取消单个任务
*/ */
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -939,7 +939,8 @@ public class TaskService implements ITaskService { ...@@ -939,7 +939,8 @@ public class TaskService implements ITaskService {
liteOrderDao.save(cacheOrder); liteOrderDao.save(cacheOrder);
liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder); liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder);
if (taskReelCount <= 0) { if (taskReelCount <= 0) {
return "工单无可执行的任务"; //return "工单无可执行的任务";
return "order.out.noTask";
} }
return ""; return "";
} }
...@@ -1966,21 +1967,21 @@ public class TaskService implements ITaskService { ...@@ -1966,21 +1967,21 @@ public class TaskService implements ITaskService {
liteOrderItem.setOutNum(liteOrderItem.getOutNum() + task.getNum()); liteOrderItem.setOutNum(liteOrderItem.getOutNum() + task.getNum());
liteOrderItem.setOutReelCount(liteOrderItem.getOutReelCount() + 1); liteOrderItem.setOutReelCount(liteOrderItem.getOutReelCount() + 1);
liteOrderItem = liteOrderItemDao.save(liteOrderItem); liteOrderItem = liteOrderItemDao.save(liteOrderItem);
Barcode barcode = barcodeManager.findByBarcode(task.getBarcode()); // Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
if (barcode != null) { // if (barcode != null) {
Float totalNeedNum = liteOrderItem.getNeedNum() * order.getOrderTimes(); // Float totalNeedNum = liteOrderItem.getNeedNum() * order.getOrderTimes();
int barcodeRemainNum = liteOrderItem.getOutNum() - totalNeedNum.intValue(); // int barcodeRemainNum = liteOrderItem.getOutNum() - totalNeedNum.intValue();
if (barcodeRemainNum < 0) { // if (barcodeRemainNum < 0) {
barcodeRemainNum = 0; // barcodeRemainNum = 0;
} // }
barcode.setAmount(barcodeRemainNum); // barcode.setAmount(barcodeRemainNum);
log.info("条码[" + task.getBarcode() + "]从工单出库,更改数量为:" + barcodeRemainNum); // log.info("条码[" + task.getBarcode() + "]从工单出库,更改数量为:" + barcodeRemainNum);
try { // try {
barcodeManager.save(barcode); // barcodeManager.save(barcode);
} catch (ValidateException e) { // } catch (ValidateException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
} }
items.add(liteOrderItem); items.add(liteOrderItem);
} }
......
myproject/src/main/resources/StorageResources.properties
...@@ -125,7 +125,7 @@ storage.status.6=Material Receiving In Process ...@@ -125,7 +125,7 @@ storage.status.6=Material Receiving In Process
storage.status.7=Material Receiving Completed storage.status.7=Material Receiving Completed
storage.status.8=Material Receiving Failed storage.status.8=Material Receiving Failed
storage.status.9=Material Retrieval in Porcess storage.status.9=Material Retrieval in Porcess
storage.status.10=Materail Retrieval Completed storage.status.10=Material Retrieval Completed
storage.status.11=Material Retrieval End storage.status.11=Material Retrieval End
storage.status.12=Material transfering storage.status.12=Material transfering
storage.status.13=System resetting storage.status.13=System resetting
......
myproject/src/main/resources/StorageResources_en.properties
...@@ -306,7 +306,7 @@ storage.status.12=Material transfering ...@@ -306,7 +306,7 @@ storage.status.12=Material transfering
order.out.notFound=The order infomation was not found order.out.notFound=The order infomation was not found
storage.status.11=Material Retrieval End storage.status.11=Material Retrieval End
workOrder.workOrder=Work Order workOrder.workOrder=Work Order
storage.status.10=Materail Retrieval completed storage.status.10=Material Retrieval completed
component.providerNumber=Supplier No. component.providerNumber=Supplier No.
storage.match.exactMatch=Exact Match storage.match.exactMatch=Exact Match
menu.workOrder=Lite Work Order menu.workOrder=Lite Work Order
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
</display:column> </display:column>
<display:column titleKey="storagePosFind.index">${pos_rowNum}</display:column> <display:column titleKey="storagePosFind.index">${pos_rowNum}</display:column>
<display:column property="barcode.barcode" titleKey="barcode.barcode" sortable="true" sortProperty="barcode.barcode"/>
<display:column titleKey="component.partNumber" style="width: 15%;" sortProperty="barcode.partNumber" sortable="true"> <display:column titleKey="component.partNumber" style="width: 15%;" sortProperty="barcode.partNumber" sortable="true">
${pos.barcode.partNumber} ${pos.barcode.partNumber}
</display:column> </display:column>
...@@ -193,7 +194,6 @@ ...@@ -193,7 +194,6 @@
<%--<c:if test="${pos.barcode.type == 3}"><fmt:message key="inOutList.type.others"/></c:if>--%> <%--<c:if test="${pos.barcode.type == 3}"><fmt:message key="inOutList.type.others"/></c:if>--%>
<%--<c:if test="${pos.barcode.type == 4}"><fmt:message key="inOutList.type.fixture"/></c:if>--%> <%--<c:if test="${pos.barcode.type == 4}"><fmt:message key="inOutList.type.fixture"/></c:if>--%>
<%--</display:column>--%> <%--</display:column>--%>
<display:column property="barcode.barcode" titleKey="barcode.barcode" sortable="true" sortProperty="barcode.barcode"/>
<display:column property="barcode.msl" titleKey="component.msl" sortable="true" sortProperty="barcode.msl"/> <display:column property="barcode.msl" titleKey="component.msl" sortable="true" sortProperty="barcode.msl"/>
<%--<display:column property="barcode.inFixture" titleKey="storagePosFind.inFixture"/>--%> <%--<display:column property="barcode.inFixture" titleKey="storagePosFind.inFixture"/>--%>
<display:column property="barcode.batch" titleKey="barcode.batch" sortable="true" sortProperty="barcode.batch"/> <display:column property="barcode.batch" titleKey="barcode.batch" sortable="true" sortProperty="barcode.batch"/>
......
myproject/src/main/webapp/WEB-INF/pages/dataLog/dataLogSearch.jsp
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<div class="col-md-2 col-xs-2"> <div class="col-md-2 col-xs-2">
<button class="btn purple" type="submit"><i class="fa fa-search"></i><fmt:message <button class="btn purple" type="submit"><i class="fa fa-search"></i><fmt:message
key="button.search"/></button> key="button.search"/></button>
<button class="btn" id="exitSystem" onclick="CloseWebPage()">AAAA</button>
</div> </div>
</div> </div>
...@@ -197,6 +198,12 @@ ...@@ -197,6 +198,12 @@
language:'zh-CN' language:'zh-CN'
}); });
function CloseWebPage() {
window.open('', '_top'); window.top.close();
}
}); });
</script> </script>
</c:set> </c:set>
\ No newline at end of file \ No newline at end of file
myproject/src/main/webapp/WEB-INF/pages/storage/boxView.jsp
...@@ -471,12 +471,17 @@ ...@@ -471,12 +471,17 @@
usedPercent =usedPercent * 100; usedPercent =usedPercent * 100;
idlePercent = idlePercent * 100; idlePercent = idlePercent * 100;
var html = "<div class='item-start barheight'>" +w +" x "+ h + " mm</div>" + <%--var html = "<div class='item-start barheight'>" +w +" x "+ h + " mm</div>" +--%>
<%--"<div class='progress my-progress'>" +--%>
<%--"<div class='progress-bar progress-bar-idle barheight' style='width:"+usedPercent+"%' title='${used_label}:"+usedCount+"'>" +--%>
<%--"<span>"+usedCount+"</span>" +--%>
<%--"</div>"+--%>
<%--"</div>";--%>
var html = "<div class='item-start barheight'>" +w +" x "+ h + " mm</div>" +
"<div class='progress my-progress'>" + "<div class='progress my-progress'>" +
"<div class='progress-bar progress-bar-idle barheight' style='width:"+usedPercent+"%' title='${used_label}:"+usedCount+"'>" + "<div class='progress-bar progress-bar-used barheight' style='width: "+usedPercent+"%'><span>"+usedCount+"</span></div> " +
"<span>"+usedCount+"</span>" + "<div class='progress-bar progress-bar-idle barheight' style='width: "+idlePercent+"%'><span> "+idleCount+"</span></div>" +
"</div>"+ "</div>";
"</div>"
return html; return html;
} }
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<div class="page-footer-inner"> <div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a> 2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div> </div>
<span class="right" style="color: #a3a3a3;">Version: 1.5.2010</span> <span class="right" style="color: #a3a3a3;">Version: 1.6.2117</span>
<div class="scroll-to-top"> <div class="scroll-to-top">
<i class="icon-arrow-up"></i> <i class="icon-arrow-up"></i>
</div> </div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!