Skip to content

孙克 / SmdBox

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

DJK定制

1 个父辈 c35dbca2
全部展开
内嵌 并排
正在显示 86 个修改的文件 包含 629 行增加 和 350 行删除
myproject/pom.xml
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
</dependencies> </dependencies>
<properties> <properties>
<app.name>smdbox</app.name> <app.name>smf</app.name>
<amp.genericCore>true</amp.genericCore> <amp.genericCore>true</amp.genericCore>
<amp.fullSource>false</amp.fullSource> <amp.fullSource>false</amp.fullSource>
<dao.framework>hibernate</dao.framework> <dao.framework>hibernate</dao.framework>
......
myproject/src/main/java/com/myproject/api/OrderFileWatch.java
...@@ -282,44 +282,81 @@ public class OrderFileWatch { ...@@ -282,44 +282,81 @@ public class OrderFileWatch {
csvRead.setSkipEmptyRecords(true);//忽略空行 csvRead.setSkipEmptyRecords(true);//忽略空行
csvRead.setTrimWhitespace(true);//去除空格 csvRead.setTrimWhitespace(true);//去除空格
csvRead.readHeaders(); csvRead.readHeaders();
int partNumberIndex = csvRead.getIndex("PN");
if (partNumberIndex == -1){ int columnCount = csvRead.getHeaderCount();
log.info("未包含PN列");
return null; int reelIdIndex = csvRead.getIndex("RI");
} if(reelIdIndex != -1 || columnCount > 22){
int qtyIndex = csvRead.getIndex("NUM","QTY"); while(csvRead.readRecord()){
if (qtyIndex == -1){ String[] lineValues = csvRead.getValues();
log.info("未包含【NUM】列"); String reelId = "";
return null; if(columnCount > 22){
} //只有V列包含Tower时才进行出库
int feederIndex = csvRead.getIndex("FEEDER"); String needOutStr = lineValues[21];
while(csvRead.readRecord()){ if(needOutStr.toUpperCase().contains("TOWER")){
String[] lineValues = csvRead.getValues(); reelId = lineValues[14];
String partNumber = lineValues[partNumberIndex]; if(reelId.contains(",")){
reelId = reelId.split(";")[0];
if(partNumber.isEmpty()){ log.info("ReelId has more vlues, only use ["+reelId+"],ignore others.");
log.warn("行[partNumber="+partNumber + "]中PN 为空,此行忽略");
}else{
int num = 1;
if(qtyIndex != -1){
String numStr = lineValues[qtyIndex];
if(Strings.isNotBlank(numStr)){
try{
num = Integer.valueOf(numStr);
}catch (Exception e){
log.error(partNumber + "的数量:" + numStr +" 不是数字,使用1");
} }
}else{
log.warn("行[reelId="+reelId + "]的V列["+needOutStr+"]不包含TOWER,此行忽略");
} }
}else{
reelId = lineValues[reelIdIndex];
} }
String feeder = ""; if(reelId.isEmpty()){
if(feederIndex != -1){ log.warn("行[reelId="+reelId + "]中RI 为空,此行忽略");
feeder = lineValues[feederIndex]; }else{
int num = 1;
LiteOrderItem item = new LiteOrderItem();
item.setReelId(reelId);
item.setPn("");
item.setNeedNum(num);
items.add(item);
}
}
}else{
int partNumberIndex = csvRead.getIndex("PN");
if (partNumberIndex == -1){
log.info("未包含PN列");
return null;
}
int qtyIndex = csvRead.getIndex("NUM","QTY");
if (qtyIndex == -1){
log.info("未包含【NUM】列");
return null;
}
int feederIndex = csvRead.getIndex("FEEDER");
while(csvRead.readRecord()){
String[] lineValues = csvRead.getValues();
String partNumber = lineValues[partNumberIndex];
if(partNumber.isEmpty()){
log.warn("行[partNumber="+partNumber + "]中PN 为空,此行忽略");
}else{
int num = 1;
if(qtyIndex != -1){
String numStr = lineValues[qtyIndex];
if(Strings.isNotBlank(numStr)){
try{
num = Integer.valueOf(numStr);
}catch (Exception e){
log.error(partNumber + "的数量:" + numStr +" 不是数字,使用1");
}
}
}
String feeder = "";
if(feederIndex != -1){
feeder = lineValues[feederIndex];
}
LiteOrderItem item = new LiteOrderItem();
item.setPn(partNumber);
item.setNeedNum(num);
item.setFeederInfo(feeder);
items.add(item);
} }
LiteOrderItem item = new LiteOrderItem();
item.setPn(partNumber);
item.setNeedNum(num);
item.setFeederInfo(feeder);
items.add(item);
} }
} }
......
myproject/src/main/java/com/myproject/bean/json/LiteOrderItem.java
...@@ -10,6 +10,12 @@ import org.springframework.data.annotation.Transient; ...@@ -10,6 +10,12 @@ import org.springframework.data.annotation.Transient;
public class LiteOrderItem extends BaseMongoBean { public class LiteOrderItem extends BaseMongoBean {
//物料编号 //物料编号
private String pn; private String pn;
/**
* 条码信息
*/
private String reelId;
//需求数量 //需求数量
private int needNum = 0; private int needNum = 0;
...@@ -98,4 +104,11 @@ public class LiteOrderItem extends BaseMongoBean { ...@@ -98,4 +104,11 @@ public class LiteOrderItem extends BaseMongoBean {
return outNum - needNum >=0; return outNum - needNum >=0;
} }
public String getReelId() {
return reelId;
}
public void setReelId(String reelId) {
this.reelId = reelId;
}
} }
myproject/src/main/java/com/myproject/bean/update/Component.java
...@@ -133,6 +133,11 @@ public class Component extends BaseMongoBean { ...@@ -133,6 +133,11 @@ public class Component extends BaseMongoBean {
*/ */
private int validDay = 0; private int validDay = 0;
/**
* 尺寸是否已经确认
*/
private boolean sizeConfirmed = false;
public Component() { public Component() {
//this.height = StorageConstants.DEFAULT_HEIGHT; //this.height = StorageConstants.DEFAULT_HEIGHT;
//this.plateSize = StorageConstants.PLATE_SIZE_SMALL; //this.plateSize = StorageConstants.PLATE_SIZE_SMALL;
...@@ -406,4 +411,13 @@ public class Component extends BaseMongoBean { ...@@ -406,4 +411,13 @@ public class Component extends BaseMongoBean {
// public void setSupplierPn(String supplierPn) { // public void setSupplierPn(String supplierPn) {
// this.supplierPn = supplierPn; // this.supplierPn = supplierPn;
// } // }
public boolean isSizeConfirmed() {
return sizeConfirmed;
}
public void setSizeConfirmed(boolean sizeConfirmed) {
this.sizeConfirmed = sizeConfirmed;
}
} }
myproject/src/main/java/com/myproject/bean/utils/StatusBean.java
...@@ -66,6 +66,11 @@ public class StatusBean { ...@@ -66,6 +66,11 @@ public class StatusBean {
* 英文提示消息 * 英文提示消息
*/ */
public String msgEn = ""; public String msgEn = "";
/**
* 日语提示消息
*/
public String msgJp = "";
/// <summary> /// <summary>
/// 包含的多个 BOX 的状态信息 /// 包含的多个 BOX 的状态信息
/// </summary> /// </summary>
...@@ -337,9 +342,12 @@ public class StatusBean { ...@@ -337,9 +342,12 @@ public class StatusBean {
public void setShowMsg(Locale local){ public void setShowMsg(Locale local){
String lang = local.getLanguage(); String lang = local.getLanguage();
String showMsg = msgData.get(lang); String showMsg = msgData.get(lang);
showMsg = null;
if(showMsg == null){ if(showMsg == null){
if(Language.ENGLISH.getLabel().contains(lang)){ if(Language.ENGLISH.getValue().contains(lang)){
showMsg = msgEn; showMsg = msgEn;
}else if(Language.Japan.getValue().contains(lang)){
showMsg = msgJp;
}else{ }else{
showMsg = msg; showMsg = msg;
} }
...@@ -462,4 +470,12 @@ public class StatusBean { ...@@ -462,4 +470,12 @@ public class StatusBean {
} }
return doorReelSignal; return doorReelSignal;
} }
public String getMsgJp() {
return msgJp;
}
public void setMsgJp(String msgJp) {
this.msgJp = msgJp;
}
} }
myproject/src/main/java/com/myproject/manager/impl/ComponentManagerImpl.java
...@@ -44,6 +44,9 @@ public class ComponentManagerImpl implements IComponentManager { ...@@ -44,6 +44,9 @@ public class ComponentManagerImpl implements IComponentManager {
if (StringUtils.isEmpty(partNumber)) if (StringUtils.isEmpty(partNumber))
return null; return null;
else { else {
if(provider == null){
provider = "";
}
Component component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,provider}); Component component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,provider});
if(component == null){ if(component == null){
component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,null}); component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,null});
......
myproject/src/main/java/com/myproject/util/BarcodeRule.java
...@@ -49,6 +49,14 @@ import java.util.Date; ...@@ -49,6 +49,14 @@ import java.util.Date;
* 例五: QTY[1:0:-1]去除前面1位后,剩余的作为数量 * 例五: QTY[1:0:-1]去除前面1位后,剩余的作为数量
* 例六: QTY[0:5:3]去除前面0位和后面3位,剩余的5位作为数量,也就是说只能为8位 * 例六: QTY[0:5:3]去除前面0位和后面3位,剩余的5位作为数量,也就是说只能为8位
* *
*
*
* PN[-1_A:0_B:13_C]RI[-1:0:-1]
*
* PN必须是以A开头,包含B,且以C结尾,去掉后面13位后的值就是PN
*
* QTY[1_Q:5:3_D]
*
* 示例: * 示例:
* 规则为: [RI]_PN_PRODATEyyMMdd_QTY[0:5:4] * 规则为: [RI]_PN_PRODATEyyMMdd_QTY[0:5:4]
* 条码: 4500065747_CS000069_180101_030000041 * 条码: 4500065747_CS000069_180101_030000041
...@@ -256,20 +264,40 @@ public class BarcodeRule { ...@@ -256,20 +264,40 @@ public class BarcodeRule {
//前缀(-1时表示没有前缀)如果要验证总长度,可设置为0 //前缀(-1时表示没有前缀)如果要验证总长度,可设置为0
private int prefix = -1; private int prefix = -1;
/**
* 以某些字符串开头
*/
private String startWith = "";
private int length = 0; private int length = 0;
/**
* 包含某此字符串
*/
private String contains = "";
//后缀(-1时表示没有前缀)如果要验证总长度,可设置为0 //后缀(-1时表示没有前缀)如果要验证总长度,可设置为0
private int suffix = -1; private int suffix = -1;
/**
* 以某此字符串结尾
*/
private String endWith = "";
//日期格式 //日期格式
private String formatStr = ""; private String formatStr = "";
@Override @Override
public String toString() { public String toString() {
return "{" + return "RuleItem{" +
"name='" + name + '\'' + "contains='" + contains + '\'' +
", name='" + name + '\'' +
", index=" + index + ", index=" + index +
", prefix='" + prefix + '\'' + ", prefix=" + prefix +
", length='" + length + '\'' + ", startWith='" + startWith + '\'' +
", suffix='" + suffix + '\'' + ", length=" + length +
", suffix=" + suffix +
", endWith='" + endWith + '\'' +
", formatStr='" + formatStr + '\'' +
'}'; '}';
} }
...@@ -290,9 +318,22 @@ public class BarcodeRule { ...@@ -290,9 +318,22 @@ public class BarcodeRule {
index = ruleIndex; index = ruleIndex;
String limitStr = ruleValue.substring(startIndex+1,endIndex); String limitStr = ruleValue.substring(startIndex+1,endIndex);
String[] limitInfo = limitStr.split(":"); String[] limitInfo = limitStr.split(":");
prefix = Integer.valueOf(limitInfo[0]); String[] first = limitInfo[0].split("_",2);
length = Integer.valueOf(limitInfo[1]); prefix = Integer.valueOf(first[0]);
suffix = Integer.valueOf(limitInfo[2]); if(first.length == 2){
startWith = first[1];
}
String[] middle = limitInfo[1].split("_",2);
length = Integer.valueOf(middle[0]);
if(middle.length == 2){
contains = middle[1];
}
String[] end = limitInfo[2].split("_",2);
suffix = Integer.valueOf(end[0]);
if(end.length == 2){
endWith = end[1];
}
if(isDateField()){ if(isDateField()){
//取日期格式 //取日期格式
formatStr = ruleValue.substring(nameIndex+name.length(),startIndex); formatStr = ruleValue.substring(nameIndex+name.length(),startIndex);
...@@ -333,6 +374,28 @@ public class BarcodeRule { ...@@ -333,6 +374,28 @@ public class BarcodeRule {
if(codeValue.length() < prefix + suffix){ if(codeValue.length() < prefix + suffix){
return null; return null;
} }
if(!Strings.isNullOrEmpty(startWith)){
//不是以startWith开头
if(!codeValue.startsWith(startWith)){
return null;
}
}
if(!Strings.isNullOrEmpty(contains)){
//不是以endWith结尾
if(!codeValue.contains(contains)){
return null;
}
}
if(!Strings.isNullOrEmpty(endWith)){
//不包含contains
if(!codeValue.endsWith(endWith)){
return null;
}
}
//如果有前缀和后缀 //如果有前缀和后缀
if(prefix > 0){ if(prefix > 0){
codeValue = codeValue.substring(prefix); codeValue = codeValue.substring(prefix);
...@@ -662,6 +725,12 @@ public class BarcodeRule { ...@@ -662,6 +725,12 @@ public class BarcodeRule {
codeStr = "=7x8=140032005 18B030918B 200.000 614A 0001045024 0001 20200414-141329"; codeStr = "=7x8=140032005 18B030918B 200.000 614A 0001045024 0001 20200414-141329";
rule = "PN BATCH QTY[-1:0:1] RI "; rule = "PN BATCH QTY[-1:0:1] RI ";
codeStr = "3$2111250314";
rule = "RI[-1:0:-1]PN[-1_3$:0:-1]";
codeStr= "10010056800202202280000002LL00001065260000000000010000";
rule = "PN[0:9:45]BATCH[9:10:-1]SP[28:10:16]QTY[44:10:0]RI[-1:0:-1]";
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){
...@@ -678,6 +747,11 @@ public class BarcodeRule { ...@@ -678,6 +747,11 @@ public class BarcodeRule {
log.info("解析失败"); log.info("解析失败");
} }
// String s = "3";
// String[] arr = s.split("_", 2);
// System.out.println(arr[0]);
// System.out.println(arr[1]);
// URI uri = new URI("smb://materialtower:Flextronics1@10.222.42.48/materialtower/re20190822161258_result.txt"); // URI uri = new URI("smb://materialtower:Flextronics1@10.222.42.48/materialtower/re20190822161258_result.txt");
......
myproject/src/main/java/com/myproject/webapp/controller/storage/CodeShelfController.java
...@@ -312,13 +312,13 @@ public class CodeShelfController extends BaseController { ...@@ -312,13 +312,13 @@ public class CodeShelfController extends BaseController {
@RequestMapping("/service/store/codeShelf/checkAll") @RequestMapping("/service/store/codeShelf/checkAll")
@ResponseBody @ResponseBody
public String checkAll(HttpServletRequest request){ public String checkAll(HttpServletRequest request){
String cid = request.getParameter("cid"); // String cid = request.getParameter("cid");
log.info(cid + "界面执行检查库位操作"); log.info("界面执行检查库位操作");
Storage storage = dataCache.getStorage(cid); // Storage storage = dataCache.getStorage(cid);
if(storage == null){ // if(storage == null){
return getText("shelf.msg.notFound",request.getLocale(),"未找到料架"); // return getText("shelf.msg.notFound",request.getLocale(),"未找到料架");
} // }
List<StoragePos> allPos = storagePosManager.findNotEmptyByStorageId(storage.getId()); List<StoragePos> allPos = storagePosManager.findNotEmpty();
for (StoragePos pos : allPos) { for (StoragePos pos : allPos) {
opPosLight("open",pos,"yellow"); opPosLight("open",pos,"yellow");
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/DataCache.java
...@@ -322,13 +322,16 @@ public class DataCache{ ...@@ -322,13 +322,16 @@ public class DataCache{
componentManager.save(component); componentManager.save(component);
}else{ }else{
//如果 barcode 里的料盘信息比 Component 中的大,使用比较大的,防止放不进去撞击 //如果 barcode 里的料盘信息比 Component 中的大,使用比较大的,防止放不进去撞击
if(codeBeanFromRule.getReelHeight() > component.getHeight() || codeBeanFromRule.getReelWidth() > component.getPlateSize()){ if(!component.isSizeConfirmed()){
log.info("更新物料["+component.getPartNumber()+"]档案尺寸["+component.getPlateSize()+"x"+component.getHeight()+"]为["+codeBeanFromRule.getReelWidth()+"x"+codeBeanFromRule.getReelHeight()+"]"); if(codeBeanFromRule.getReelHeight() > component.getHeight() || codeBeanFromRule.getReelWidth() > component.getPlateSize()){
component.setPlateSize(barcodeFromRule.getPlateSize()); log.info("更新物料["+component.getPartNumber()+"]档案尺寸["+component.getPlateSize()+"x"+component.getHeight()+"]为["+codeBeanFromRule.getReelWidth()+"x"+codeBeanFromRule.getReelHeight()+"]");
component.setHeight(barcodeFromRule.getHeight()); component.setPlateSize(barcodeFromRule.getPlateSize());
componentManager.save(component); component.setHeight(barcodeFromRule.getHeight());
componentManager.save(component);
}
} }
codeBeanFromRule.setShowImg(component.getShowImg());
//codeBeanFromRule.setShowImg(component.getShowImg());
} }
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/StatusController.java
...@@ -57,9 +57,11 @@ public class StatusController extends BaseController{ ...@@ -57,9 +57,11 @@ public class StatusController extends BaseController{
String msg = getText(e.getMessage(),((ValidateException) e).getParams(), request.getLocale(),e.getMessage()); String msg = getText(e.getMessage(),((ValidateException) e).getParams(), request.getLocale(),e.getMessage());
statusBean.setMsg(msg); statusBean.setMsg(msg);
statusBean.setMsgEn(msg); statusBean.setMsgEn(msg);
statusBean.setMsgJp(e.getMessage());
}else{ }else{
statusBean.setMsg(e.getMessage()); statusBean.setMsg(e.getMessage());
statusBean.setMsgEn(e.getMessage()); statusBean.setMsgEn(e.getMessage());
statusBean.setMsgJp(e.getMessage());
} }
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java
...@@ -609,6 +609,8 @@ public class StorageDataController extends BaseController { ...@@ -609,6 +609,8 @@ public class StorageDataController extends BaseController {
resultBean.addOp(opMap); resultBean.addOp(opMap);
storageOpMap.remove(resultBean.getCid()); storageOpMap.remove(resultBean.getCid());
} }
int queueTaskCount = taskService.getQueueTasks(statusBean.getCid()).size();
resultBean.addData("queueTaskCount",queueTaskCount+"");
//log.info("返回seq:"+resultBean.getSeq()); //log.info("返回seq:"+resultBean.getSeq());
return resultBean; return resultBean;
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -213,6 +213,14 @@ public class TaskService implements ITaskService { ...@@ -213,6 +213,14 @@ public class TaskService implements ITaskService {
String barcode = statusBean.getCode(); String barcode = statusBean.getCode();
Barcode barcodeSave = resolveBarcode(barcode); Barcode barcodeSave = resolveBarcode(barcode);
Component component = componentManager.findByPartNumberAndProvider(barcodeSave.getPartNumber(),barcodeSave.getProvider());
if(component != null && component.isSizeConfirmed()){
//如果条码已确认过,使用确认过的尺寸
barcodeSave.setPlateSize(component.getPlateSize());
barcodeSave.setHeight(component.getHeight());
barcodeSave = barcodeManager.save(barcodeSave);
}
if (storage.isSolderPaste()) { if (storage.isSolderPaste()) {
int weight = statusBean.getWeight(); int weight = statusBean.getWeight();
//锡膏料仓,修改类型 //锡膏料仓,修改类型
...@@ -286,6 +294,10 @@ public class TaskService implements ITaskService { ...@@ -286,6 +294,10 @@ public class TaskService implements ITaskService {
log.info(barcodeSave.getBarcode() + "单盘入库,出库时此条码只可单盘出库"); log.info(barcodeSave.getBarcode() + "单盘入库,出库时此条码只可单盘出库");
barcodeSave.setOnlySingleOut(true); barcodeSave.setOnlySingleOut(true);
barcodeManager.save(barcodeSave); barcodeManager.save(barcodeSave);
}else if(barcodeSave.isOnlySingleOut()){
log.info(barcodeSave.getBarcode() + "不是从紧急口入库, 修改单盘入库为false");
barcodeSave.setOnlySingleOut(false);
barcodeManager.save(barcodeSave);
} }
} }
...@@ -905,10 +917,29 @@ public class TaskService implements ITaskService { ...@@ -905,10 +917,29 @@ public class TaskService implements ITaskService {
int assignNum = 0; int assignNum = 0;
while (assignNum < remainNum) { while (assignNum < remainNum) {
Collection<String> excludePosIds = excludePosIds(); Collection<String> excludePosIds = excludePosIds();
StoragePos pos = null;
String partNumber = orderItem.getPn(); String partNumber = orderItem.getPn();
StoragePos pos = storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType); if(Strings.isNullOrEmpty(partNumber)){
String reelId = orderItem.getReelId();
Collection<DataLog> tasks = taskMap.values();
boolean hasSameTask = false;
for (DataLog task : tasks) {
//检查 barcode
if (task.isCheckOutTask() && task.getBarcode().equals(orderItem.getReelId())) {
log.info("二维码:[" + reelId + "]已在出库队列中,忽略");
hasSameTask = true;
break;
}
}
if(!hasSameTask){
pos = storagePosManager.getByBarcode(orderItem.getReelId());
}
}else{
pos = storagePosManager.findPartNumberInStorages(availableStorageIds, partNumber, excludePosIds, checkoutType);
}
if (pos == null) { if (pos == null) {
log.error("未找到可以出库的物料[" + partNumber + "]"); log.error("未找到可以出库的物料[" + partNumber + "]/"+ orderItem.getReelId());
break; break;
} else { } else {
assignNum = assignNum + pos.getBarcode().getAmount(); assignNum = assignNum + pos.getBarcode().getAmount();
...@@ -922,7 +953,7 @@ public class TaskService implements ITaskService { ...@@ -922,7 +953,7 @@ public class TaskService implements ITaskService {
task.setType(StorageConstants.OP.CHECKOUT); task.setType(StorageConstants.OP.CHECKOUT);
task.setLightColor(nextColor.getRgb()); task.setLightColor(nextColor.getRgb());
task.setStatus(StorageConstants.OP_STATUS.WAIT.name()); task.setStatus(StorageConstants.OP_STATUS.WAIT.name());
task = dataLogDao.save(task); //task = dataLogDao.save(task);
addTaskToExecute(task); addTaskToExecute(task);
} }
} }
...@@ -1309,6 +1340,8 @@ public class TaskService implements ITaskService { ...@@ -1309,6 +1340,8 @@ public class TaskService implements ITaskService {
statusBean.setBoxStatus(statusOfBoxes); statusBean.setBoxStatus(statusOfBoxes);
statusBean.setData(statusBeanToSave.getData()); statusBean.setData(statusBeanToSave.getData());
statusBean.setMsg(statusBeanToSave.getMsg()); statusBean.setMsg(statusBeanToSave.getMsg());
statusBean.setMsgJp(statusBeanToSave.getMsgJp());
statusBean.setMsgEn(statusBeanToSave.getMsgEn());
statusBean.setStatus(statusBeanToSave.getStatus()); statusBean.setStatus(statusBeanToSave.getStatus());
statusBean.setOp(statusBeanToSave.getOp()); statusBean.setOp(statusBeanToSave.getOp());
statusBean.setSeq(statusBeanToSave.getSeq()); statusBean.setSeq(statusBeanToSave.getSeq());
...@@ -1351,10 +1384,11 @@ public class TaskService implements ITaskService { ...@@ -1351,10 +1384,11 @@ public class TaskService implements ITaskService {
statusMap.put(cid, statusBean); statusMap.put(cid, statusBean);
//清空 msg 的内容,因为客户端会据此决定命令是否执行 //清空 msg 的内容,因为客户端会据此决定命令是否执行
statusBean.setMsg(""); statusBeanToSave.setMsg("");
statusBean.setMsgEn(""); statusBeanToSave.setMsgEn("");
statusBeanToSave.setMsgJp("");
return statusBean; return statusBeanToSave;
} }
private void changeSolderStatus(String posId, int solderStatus) throws ValidateException { private void changeSolderStatus(String posId, int solderStatus) throws ValidateException {
......
myproject/src/main/java/com/myproject/webapp/controller/workOrder/LiteOrderSearchController.java
...@@ -48,8 +48,14 @@ public class LiteOrderSearchController extends BaseSearchController { ...@@ -48,8 +48,14 @@ public class LiteOrderSearchController extends BaseSearchController {
} }
query.addCriteria(criteria); query.addCriteria(criteria);
PageList pageList = liteOrderDao.findByQuery(query, searchCriteria.getPageList()); PageList pageList = searchCriteria.getPageList();
searchCriteria.setPageList(pageList); if(pageList.getSortCriterion().equals("id")){
pageList.setSortCriterion("createDate");
pageList.setSortDirection(SortOrderEnum.DESCENDING);
searchCriteria.setPageList(pageList);
}
searchCriteria.setPageList(liteOrderDao.findByQuery(query, searchCriteria.getPageList()));
return "workOrder/liteOrderSearch"; return "workOrder/liteOrderSearch";
} }
......
myproject/src/main/java/com/myproject/webapp/filter/LocaleFilter.java
...@@ -85,6 +85,12 @@ public class LocaleFilter extends OncePerRequestFilter { ...@@ -85,6 +85,12 @@ public class LocaleFilter extends OncePerRequestFilter {
if(preferredLocale == null){//没有设置过,使用用户设置的 Locale if(preferredLocale == null){//没有设置过,使用用户设置的 Locale
if(loginUser != null){ if(loginUser != null){
preferredLocale = Language.getLocale(loginUser.getLanguage()); preferredLocale = Language.getLocale(loginUser.getLanguage());
}else{
String acceptLanguage = request.getHeader("Accept-Language");
preferredLocale = Language.getLocale(acceptLanguage);
if(preferredLocale == null){
preferredLocale = Language.getLocale("jp");
}
} }
} }
......
myproject/src/main/resources/ApplicationResources.properties
...@@ -359,7 +359,7 @@ inOutList.type.pcbFixture=PCB Fixture ...@@ -359,7 +359,7 @@ inOutList.type.pcbFixture=PCB Fixture
storagePosFind.outSelect=Material Retrieval Position storagePosFind.outSelect=Material Retrieval Position
storagePosFind.outInaction=Dead Stock Retrieval storagePosFind.outInaction=Dead Stock Retrieval
storagePosFind.daysAgo=Days ago storagePosFind.daysAgo=Days ago
storagePosFind.index=Index storagePosFind.index=No.
storagePosFind.inFixture=Fixture No. storagePosFind.inFixture=Fixture No.
inOutList.type.fixture=Fixture inOutList.type.fixture=Fixture
barcode.produceDate=Manufacturing Date barcode.produceDate=Manufacturing Date
...@@ -411,4 +411,5 @@ settings.backup.versions=Version List ...@@ -411,4 +411,5 @@ settings.backup.versions=Version List
settings.restore.warning=Warning\: This operation cannot be undone. \!\!\! settings.restore.warning=Warning\: This operation cannot be undone. \!\!\!
settings.restore.confirm=Would you like to proceed? settings.restore.confirm=Would you like to proceed?
settings.restore.success=Operation succeeded settings.restore.success=Operation succeeded
checkout.sucess=Add task list success
\ No newline at end of file \ No newline at end of file
checkout.sucess=Add task list success
allBoxView.noOrder=No order available
\ No newline at end of file \ No newline at end of file
myproject/src/main/resources/ApplicationResources_en.properties
...@@ -328,3 +328,4 @@ storagePosFind.outSelect=Retrieval material position ...@@ -328,3 +328,4 @@ storagePosFind.outSelect=Retrieval material position
dataReport.overduePcb=Expired PCB dataReport.overduePcb=Expired PCB
allBoxView.humidity=Humidity allBoxView.humidity=Humidity
errors.minlength={0} cannot be less than {1} characters. errors.minlength={0} cannot be less than {1} characters.
allBoxView.noOrder=No order available
myproject/src/main/resources/ApplicationResources_zh.properties
...@@ -328,3 +328,4 @@ storagePosFind.outSelect=\u51FA\u5E93\u6240\u9009\u4ED3\u4F4D ...@@ -328,3 +328,4 @@ storagePosFind.outSelect=\u51FA\u5E93\u6240\u9009\u4ED3\u4F4D
allBoxView.humidity=\u6E7F\u5EA6 allBoxView.humidity=\u6E7F\u5EA6
dataReport.overduePcb=\u8FC7\u671FPCB dataReport.overduePcb=\u8FC7\u671FPCB
errors.minlength={0} \u4E0D\u80FD\u5C11\u4E8E {1} \u4E2A\u5B57\u7B26\u3002 errors.minlength={0} \u4E0D\u80FD\u5C11\u4E8E {1} \u4E2A\u5B57\u7B26\u3002
allBoxView.noOrder=\u65E0\u53EF\u7528\u7684\u5DE5\u5355
myproject/src/main/resources/StorageResources.properties
...@@ -271,6 +271,7 @@ storage.area.empty=storage area required ...@@ -271,6 +271,7 @@ storage.area.empty=storage area required
component.auto.scancode=barcode input please component.auto.scancode=barcode input please
component.plate.size= Plate Size component.plate.size= Plate Size
component.plate.size.confirm=Size Confirmed
component.amount.empty=component qty required. component.amount.empty=component qty required.
component.plateSize.empty=component diameter required component.plateSize.empty=component diameter required
component.height.empty=component height required component.height.empty=component height required
......
myproject/src/main/resources/StorageResources_en.properties
...@@ -87,6 +87,7 @@ storage.enable.yes=Yes ...@@ -87,6 +87,7 @@ storage.enable.yes=Yes
user.firstName=First Name user.firstName=First Name
menu.cloud.checkOut=Material Search menu.cloud.checkOut=Material Search
component.plate.size=Plate Size component.plate.size=Plate Size
component.plate.size.confirm=Size Confirmed
storage.saveSuccess=Storage information saved successfully storage.saveSuccess=Storage information saved successfully
barcode.height=Height barcode.height=Height
chart.showType.DAY=Day chart.showType.DAY=Day
......
myproject/src/main/resources/StorageResources_zh_CN.properties
...@@ -86,6 +86,7 @@ storage.enable.yes=\u662F ...@@ -86,6 +86,7 @@ storage.enable.yes=\u662F
user.firstName=\u540D user.firstName=\u540D
menu.cloud.checkOut=\u6599\u4EF6\u67E5\u627E\u51FA\u5E93 menu.cloud.checkOut=\u6599\u4EF6\u67E5\u627E\u51FA\u5E93
component.plate.size=\u6599\u76D8\u5C3A\u5BF8 component.plate.size=\u6599\u76D8\u5C3A\u5BF8
component.plate.size.confirm=\u5C3A\u5BF8\u5DF2\u786E\u8BA4
storage.saveSuccess=\u6599\u4ED3\u4FE1\u606F\u4FDD\u5B58\u6210\u529F storage.saveSuccess=\u6599\u4ED3\u4FE1\u606F\u4FDD\u5B58\u6210\u529F
barcode.height=\u6599\u76D8\u9AD8\u5EA6 barcode.height=\u6599\u76D8\u9AD8\u5EA6
chart.showType.DAY=\u5929 chart.showType.DAY=\u5929
...@@ -183,7 +184,7 @@ storage.error.unique=\u4ED3\u5E93\u540D\u5DF2\u88AB\u4F7F\u7528\uFF0C\u8BF7\u653 ...@@ -183,7 +184,7 @@ storage.error.unique=\u4ED3\u5E93\u540D\u5DF2\u88AB\u4F7F\u7528\uFF0C\u8BF7\u653
storagePos.layer=\u5C42\u6570 storagePos.layer=\u5C42\u6570
authority.stockOut=\u51FA\u5165\u5E93 authority.stockOut=\u51FA\u5165\u5E93
storage.enable.prohibit=\u7981\u7528 storage.enable.prohibit=\u7981\u7528
component.amount=\u5C01\u88C5\u6570\u91CF component.amount=\u6570\u91CF
plate.size.customer=\u81EA\u5B9A\u4E49\u5C3A\u5BF8 plate.size.customer=\u81EA\u5B9A\u4E49\u5C3A\u5BF8
storage.type.batch=\u6279\u91CF\u6599\u4ED3 storage.type.batch=\u6279\u91CF\u6599\u4ED3
dataLog.operator=\u64CD\u4F5C\u5458 dataLog.operator=\u64CD\u4F5C\u5458
...@@ -225,7 +226,7 @@ boxChart.pcbIn=PCB \u5165\u5E93 ...@@ -225,7 +226,7 @@ boxChart.pcbIn=PCB \u5165\u5E93
dataLog.putIn={0}[\u6570\u91CF\uFF1A{1}]\u5165\u5E93\u5230[{2}] dataLog.putIn={0}[\u6570\u91CF\uFF1A{1}]\u5165\u5E93\u5230[{2}]
component.list=\u6599\u4EF6\u5217\u8868 component.list=\u6599\u4EF6\u5217\u8868
barcode.error.amount.negative=\u6761\u7801{0}\u5173\u8054\u7684\u6599\u4EF6\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0 barcode.error.amount.negative=\u6761\u7801{0}\u5173\u8054\u7684\u6599\u4EF6\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
button.search=\u67E5\u8BE2 button.search=\u641C\u7D22
error.barcode.wrongLength=\u6761\u7801[{0}]\u957F\u5EA6\u9519\u8BEF error.barcode.wrongLength=\u6761\u7801[{0}]\u957F\u5EA6\u9519\u8BEF
storagePos.height=\u9AD8\u5EA6 storagePos.height=\u9AD8\u5EA6
settings.remind.deadday=\u5929\u524D\u5446\u6EDE\u7269\u6599\u63D0\u9192 settings.remind.deadday=\u5929\u524D\u5446\u6EDE\u7269\u6599\u63D0\u9192
......
myproject/src/main/resources/displaytag_en.properties
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
# http://displaytag.sourceforge.net/configuration.html # http://displaytag.sourceforge.net/configuration.html
basic.empty.showtable=true basic.empty.showtable=true
paging.banner.onepage=
basic.msg.empty_list=No items found basic.msg.empty_list=No items found
basic.msg.empty_list_row=<tr class="empty"><td colspan="0">No items found</td></tr></tr> basic.msg.empty_list_row=<tr class\="empty"><td colspan\="0">No items found</td></tr></tr>
paging.banner.no_items_found=<span class="pagebanner">No {0} record found.</span> paging.banner.no_items_found=<span class\="pagebanner">No {0} record found.</span>
paging.banner.one_item_found=<span class="pagebanner">Found one {0} record.</span> paging.banner.one_item_found=<span class\="pagebanner">Found one {0} record.</span>
paging.banner.all_items_found=<span class="pagebanner">Found {0} records of {1}. Show all {2} records.</span> paging.banner.all_items_found=<span class="pagebanner">Found {0} records of {1}. Show all {2} records.</span>
paging.banner.some_items_found=<span class="pagebanner">Found {0} records of {1}. Show the {2} records from to {3}\u3002</span> paging.banner.some_items_found=<span class="pagebanner">Found {0} records of {1}. Show the {2} records from to {3}。</span>
paging.banner.full=<span class="pagelinks">[<a href="{1}">First</a>/<a href="{2}">Previous</a>]{0}[<a href="{3}">Next</a>/<a href="{4}">Last</a>]</span> paging.banner.full=<span class\="pagelinks">[<a href\="{1}">First</a>/<a href\="{2}">Previous</a>]{0}[<a href\="{3}">Next</a>/<a href\="{4}">Last</a>]</span>
paging.banner.first=<span class="pagelinks">[First/Previous] {0}[<a href="{3}">Next</a>/<a href="{4}">Last</a>]</span> paging.banner.first=<span class="pagelinks">[First/Previous] {0}[<a href="{3}">Next</a>/<a href="{4}">Last</a>]</span>
paging.banner.last=<span class="pagelinks">[<a href="{1}">First</a>/<a href="{2}">Previous</a>]{0} [Next/Last]</span> paging.banner.last=<span class="pagelinks">[<a href="{1}">First</a>/<a href="{2}">Previous</a>]{0} [Next/Last]</span>
paging.banner.page.link=<a href="{1}" title="Jump to Page {0}">{0}</a> paging.banner.page.link=<a href="{1}" title="Jump to Page {0}">{0}</a>
......
myproject/src/main/resources/displaytag_jp.properties
#For a list of settings you can customize, see #For a list of settings you can customize, see
# http://displaytag.sourceforge.net/configuration.html # http://displaytag.sourceforge.net/configuration.html
basic.empty.showtable=true basic.empty.showtable=true
paging.banner.onepage= paging.banner.onepage=
basic.msg.empty_list=結果がありません。 basic.msg.empty_list=\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093
basic.msg.empty_list_row=<tr class="empty"><td colspan="{0}">結果がありません。</td></tr></tr> basic.msg.empty_list_row=<tr class="empty"><td colspan="{0}">\u7D50\u679C\u304C\u3042\u308A\u307E\u305B\u3093\u3002</td></tr></tr>
paging.banner.no_items_found=<span class="pagebanner">記録{0}が見つかりません。</span> paging.banner.no_items_found=<span class="pagebanner">\u8A18\u9332{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002</span>
paging.banner.one_item_found=<span class="pagebanner">一個{0}の記録を見つかりました。</span> paging.banner.one_item_found=<span class="pagebanner">\u4E00\u500B{0}\u306E\u8A18\u9332\u3092\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002</span>
paging.banner.all_items_found=<span class="pagebanner">{0}個の記録を見つかりました。{1}记录，显示所有{2}记录。</span> paging.banner.all_items_found=<span class="pagebanner">{0}\u500B\u306E\u8A18\u9332\u3092\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002{1}\u8BB0\u5F55\uFF0C\u663E\u793A\u6240\u6709{2}\u8BB0\u5F55\u3002</span>
paging.banner.some_items_found=<span class="pagebanner">{0}個{1}記録を見つかった、第{2}個から第{3}個まで表示しています。</span> paging.banner.some_items_found=<span class\="pagebanner">\u5408\u8A08{0}\u4EF6\u500B\u3001\uFF08{2}-{3}\u4EF6\u8868\u793A\uFF09\u3002</span>
paging.banner.full=<span class="pagelinks">[<a href="{1}">トップページ</a>/<a href="{2}">前のページ</a>]{0}[<a href="{3}">次のページ</a>/<a href="{4}">最後のページ</a>]</span> paging.banner.full=<span class\="pagelinks">[<a href\="{1}">Top</a>/<a href\="{2}">Previous</a>]{0}[<a href\="{3}">Next</a>/<a href\="{4}">Last</a>]</span>
paging.banner.first=<span class="pagelinks">[トップページ/前のページ] {0}[<a href="{3}">次のページ</a>/<a href="{4}">最後のページ</a>]</span> paging.banner.first=<span class\="pagelinks">[Top/Previous] {0}[<a href\="{3}">Next</a>/<a href\="{4}">Last</a>]</span>
paging.banner.last=<span class="pagelinks">[<a href="{1}">トップページ</a>/<a href="{2}">前のページ</a>]{0} [次のページ/最後のページ]</span> paging.banner.last=<span class\="pagelinks">[<a href\="{1}">Previous</a>/<a href\="{2}">Previous</a>]{0} [Next/Last]</span>
paging.banner.page.link=<a href="{1}" title="第{0}ページに行きます。">{0}</a> paging.banner.page.link=<a href="{1}" title="\u7B2C{0}\u30DA\u30FC\u30B8\u306B\u884C\u304D\u307E\u3059\u3002">{0}</a>
paging.banner.item_name= paging.banner.item_name=
paging.banner.items_name= paging.banner.items_name=
paging.banner.placement=bottom paging.banner.placement=bottom
export.banner=<div style="float:right"> {0}まで出力</div> export.banner=<div style="float:right"> {0}\u51FA\u529B</div>
myproject/src/main/webapp/WEB-INF/pages/admin/activeUsers.jsp
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<%--<p><fmt:message key="activeUsers.message"/></p>--%> <%--<p><fmt:message key="activeUsers.message"/></p>--%>
<display:table name="applicationScope.userNames" id="user" cellspacing="0" cellpadding="0" <display:table name="applicationScope.userNames" id="user" cellspacing="0" cellpadding="0"
defaultsort="1" class="table table-condensed table-striped table-hover" pagesize="50" requestURI=""> defaultsort="1" class="table table-condensed blue-steel" pagesize="50" requestURI="">
<display:column property="username" titleKey="user.username" <display:column property="username" titleKey="user.username"
sortable="true"/> sortable="true"/>
<display:column titleKey="activeUsers.fullName" sortable="true"> <display:column titleKey="activeUsers.fullName" sortable="true">
......
myproject/src/main/webapp/WEB-INF/pages/barcode/barcodeSearch.jsp
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<i class="fa fa-list-alt"></i><fmt:message key="barcode.search.subtitle"/> <i class="fa fa-list-alt"></i><fmt:message key="barcode.search.subtitle"/>
</div> </div>
<div class="actions"> <div class="actions">
<a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i class="fa fa-upload"></i><fmt:message <%-- <a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i class="fa fa-upload"></i><fmt:message--%>
key="button.uploadFile"/> </a> <%-- key="button.uploadFile"/> </a>--%>
<a href="${ctx}/barcode/barcodeUpdate.html" class="btn btn-default btn-sm"> <a href="${ctx}/barcode/barcodeUpdate.html" class="btn btn-default btn-sm">
<i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a> <i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a>
</div> </div>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" defaultsort="1" class="table table-bordered blue-steel" export="false"
id="barcode"> id="barcode">
<display:column sortProperty="barcode" sortable="true" titleKey="barcode.barcode"> <display:column sortProperty="barcode" sortable="true" titleKey="barcode.barcode">
<a href="${ctx}/barcode/barcodeUpdate.html?id=${barcode.id}">${barcode.barcode}</a> <a href="${ctx}/barcode/barcodeUpdate.html?id=${barcode.id}">${barcode.barcode}</a>
......
myproject/src/main/webapp/WEB-INF/pages/barcode/barcodeUpdate.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-pencil"></i><fmt:message key="barcode.updateTitle"/> <i class="fa fa-pencil"></i><fmt:message key="barcode.updateTitle"/>
...@@ -125,9 +125,9 @@ ...@@ -125,9 +125,9 @@
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-9"> <div class="col-md-offset-3 col-md-9">
<button class="btn green" type="submit" name="method" value="add"><i class="fa fa-save"></i><fmt:message key="button.save"/></button> <button class="btn green" type="submit" name="method" value="add"><i class="fa fa-save"></i><fmt:message key="button.save"/></button>
<c:if test="${not empty barcode.id}"> <%-- <c:if test="${not empty barcode.id}">--%>
<button class="btn red" type="submit" name="method" value="delete"><i class="fa fa-trash-o"></i><fmt:message key="button.delete"/></button> <%-- <button class="btn red" type="submit" name="method" value="delete"><i class="fa fa-trash-o"></i><fmt:message key="button.delete"/></button>--%>
</c:if> <%-- </c:if>--%>
<button type="button" class="btn default" onclick="window.location=''"><i class="fa fa-history"></i><fmt:message key="button.cancel"/></button> <button type="button" class="btn default" onclick="window.location=''"><i class="fa fa-history"></i><fmt:message key="button.cancel"/></button>
</div> </div>
</div> </div>
......
myproject/src/main/webapp/WEB-INF/pages/cabinet/cabinetBox.jsp
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="table-scrollable"> <div class="table-scrollable">
<table class="table table-striped table-hover"> <table class="table blue-steel">
<thead> <thead>
<tr> <tr>
<th> <th>
......
myproject/src/main/webapp/WEB-INF/pages/cloud/alarmInfoSearch.jsp
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</form> </form>
<display:table name="searchCriteria.pageList" requestURI="" <display:table name="searchCriteria.pageList" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="alarmInfo"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="alarmInfo">
<display:column titleKey="alarmInfo.position" sortable="true" sortProperty="storageName"> <display:column titleKey="alarmInfo.position" sortable="true" sortProperty="storageName">
${alarmInfo.storageName}<c:if test="${alarmInfo.boxId != 0}">-BOX ${alarmInfo.boxId}</c:if> ${alarmInfo.storageName}<c:if test="${alarmInfo.boxId != 0}">-BOX ${alarmInfo.boxId}</c:if>
</display:column> </display:column>
......
myproject/src/main/webapp/WEB-INF/pages/cloud/storageCloudUpdate.jsp
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>料仓详情 <i class="fa fa-gift"></i>料仓详情
......
myproject/src/main/webapp/WEB-INF/pages/component/alarmInventory.jsp
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<table class="table table-striped table-bordered table-hover"> <table class="table table-bordered blue-steel">
<thead> <thead>
<tr> <tr>
<th class="sorted order2">料件编号</th> <th class="sorted order2">料件编号</th>
......
myproject/src/main/webapp/WEB-INF/pages/component/bomSearch.jsp
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false"> defaultsort="1" class="table table-bordered blue-steel" export="false">
<display:column property="name" escapeXml="true" titleKey="bom.name" url="bomUpdate.html" <display:column property="name" escapeXml="true" titleKey="bom.name" url="bomUpdate.html"
paramId="id" paramProperty="id"/> paramId="id" paramProperty="id"/>
......
myproject/src/main/webapp/WEB-INF/pages/component/bomUpdate.jsp
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-pencil"></i><fmt:message key="bom.update.subtitle"/> <i class="fa fa-pencil"></i><fmt:message key="bom.update.subtitle"/>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<table id="bomUpdateForm.componentList" <table id="bomUpdateForm.componentList"
class="table table-striped table-hover table-bordered dataTable no-footer" role="grid" class="table blue-steel table-bordered dataTable no-footer" role="grid"
aria-describedby="sample_editable_1_info"> aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
......
myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
<div class="actions"> <div class="actions">
<a href="componentUpdate.html?type=${type}" class="btn btn-default btn-sm"> <a href="componentUpdate.html?type=${type}" class="btn btn-default btn-sm">
<i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a> <i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a>
<a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i <%-- <a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i--%>
class="fa fa-upload"></i><fmt:message <%-- class="fa fa-upload"></i><fmt:message--%>
key="button.uploadFile"/></a> <%-- key="button.uploadFile"/></a>--%>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}"
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="component"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="component">
<%--<display:column property="name" titleKey="component.name"/>--%> <%--<display:column property="name" titleKey="component.name"/>--%>
<display:column titleKey="component.partNumber"> <display:column titleKey="component.partNumber">
<a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a> <a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a>
...@@ -102,6 +102,12 @@ ...@@ -102,6 +102,12 @@
<display:column titleKey="component.plate.size"> <display:column titleKey="component.plate.size">
${component.plateSize} x ${component.height} ${component.plateSize} x ${component.height}
</display:column> </display:column>
<display:column titleKey="component.plate.size.confirm" sortProperty="sizeConfirmed" sortable="false">
<c:if test="${component.sizeConfirmed}">
Yes
</c:if>
</display:column>
<%--<display:column property="validDay" titleKey="component.validDay"/>--%> <%--<display:column property="validDay" titleKey="component.validDay"/>--%>
<%--<display:column property="type" titleKey="类型"/>--%> <%--<display:column property="type" titleKey="类型"/>--%>
<display:column property="amount" titleKey="component.amount"/> <display:column property="amount" titleKey="component.amount"/>
...@@ -168,7 +174,7 @@ ...@@ -168,7 +174,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}"
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="component"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="component">
<display:column titleKey="component.partNumber"> <display:column titleKey="component.partNumber">
<a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a> <a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a>
</display:column> </display:column>
...@@ -265,7 +271,7 @@ ...@@ -265,7 +271,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}"
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="component"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="component">
<%--<display:column property="name" titleKey="component.name"/>--%> <%--<display:column property="name" titleKey="component.name"/>--%>
<display:column property="name" titleKey="component.name"/> <display:column property="name" titleKey="component.name"/>
<display:column titleKey="component.partNumber"> <display:column titleKey="component.partNumber">
...@@ -346,7 +352,7 @@ ...@@ -346,7 +352,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="componentSearch.html?type=${type}"
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="component"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="component">
<%--<display:column property="name" titleKey="component.name"/>--%> <%--<display:column property="name" titleKey="component.name"/>--%>
<display:column property="name" titleKey="夹具名称"/> <display:column property="name" titleKey="夹具名称"/>
<display:column titleKey="编号"> <display:column titleKey="编号">
......
myproject/src/main/webapp/WEB-INF/pages/component/componentUpdate.jsp
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="row"> <div class="row">
<div class="col-md-22"> <div class="col-md-22">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<%--<div class="caption">--%> <%--<div class="caption">--%>
<%--<i class="fa fa-pencil"></i><fmt:message key="component.update.subtitle"/>--%> <%--<i class="fa fa-pencil"></i><fmt:message key="component.update.subtitle"/>--%>
...@@ -383,15 +383,6 @@ ...@@ -383,15 +383,6 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<%--有效期--%>
<%--<label class="control-label col-md-2"><fmt:message key="component.validDay"/> </label>--%>
<%--<div class="col-md-3">--%>
<%--<div style="text-align:left" class="input-group">--%>
<%--<form:input type="text" path="validDay"--%>
<%--class="form-control"/>--%>
<%--</div>--%>
<%--</div>--%>
<label class="control-label col-md-2"><fmt:message key="component.plate.size"/> </label> <label class="control-label col-md-2"><fmt:message key="component.plate.size"/> </label>
...@@ -415,6 +406,16 @@ ...@@ -415,6 +406,16 @@
</div> </div>
<%--有效期--%>
<label class="control-label col-md-2"><fmt:message key="component.plate.size.confirm"/> </label>
<div class="col-md-3">
<div style="text-align:left" class="input-group">
<form:checkbox path="sizeConfirmed" class="form-control"/>
</div>
</div>
</div> </div>
...@@ -584,13 +585,13 @@ ...@@ -584,13 +585,13 @@
class="fa fa-save"></i><fmt:message class="fa fa-save"></i><fmt:message
key="button.save"/></button> key="button.save"/></button>
<c:if test="${not empty component.id}"> <%-- <c:if test="${not empty component.id}">--%>
<button class="btn red" type="button" onclick="deleteComponent()"><i <%-- <button class="btn red" type="button" onclick="deleteComponent()"><i--%>
class="fa fa-trash-o"></i><fmt:message <%-- class="fa fa-trash-o"></i><fmt:message--%>
key="button.delete"/></button> <%-- key="button.delete"/></button>--%>
</c:if> <%-- </c:if>--%>
<button class="btn default" type="button" <button class="btn default" type="button"
onclick="window.location=''"><i onclick="window.location=''"><i
class="fa fa-history"></i><fmt:message key="button.cancel"/></button> class="fa fa-history"></i><fmt:message key="button.cancel"/></button>
......
myproject/src/main/webapp/WEB-INF/pages/component/inventory.jsp
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="portlet-body"> <div class="portlet-body">
<div class="col-md-12 col-sm-12"><div><input type="search" class="form-control input-inline filterInput right"></div></div> <div class="col-md-12 col-sm-12"><div><input type="search" class="form-control input-inline filterInput right"></div></div>
<display:table name="${inventory}" requestURI="" cellspacing="0" cellpadding="0" sort="list" class="table table-striped table-bordered table-hover" id="inventoryItem" export="true"> <display:table name="${inventory}" requestURI="" cellspacing="0" cellpadding="0" sort="list" class="table table-bordered blue-steel" id="inventoryItem" export="true">
<display:setProperty name="export.csv.filename" value="inventory.csv" /> <display:setProperty name="export.csv.filename" value="inventory.csv" />
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
...@@ -65,20 +65,17 @@ ...@@ -65,20 +65,17 @@
</div> </div>
<label class="control-label col-md-1"><fmt:message key="dataLog.date"/></label> <label class="control-label col-md-1"><fmt:message key="dataLog.date"/></label>
<div class="col-md-3" style="padding-left:0px;"> <div class="col-md-2" style="padding-left:0px;">
<div class="input-group input-large date-picker input-daterange" data-date="2017-05-10" data-date-format="${datePatten}"> <div class="input-group input-large date-picker input-daterange" data-date="2017-05-10" data-date-format="${datePatten}">
<input type="text" class="form-control" name="startDay" value="${startDay}"> <input type="text" class="form-control" name="startDay" value="${startDay}">
<span class="input-group-addon"> <span class="input-group-addon">
to </span> to </span>
<input type="text" class="form-control" name="endDay" value="${endDay}"> <input type="text" class="form-control" name="endDay" value="${endDay}" style="width:80%">
</div> </div>
<!-- /input-group --> <!-- /input-group -->
<span class="help-block"> </span> <span class="help-block"> </span>
</div> </div>
<div class="col-md-2">
<button class="btn purple" type="submit"><i class="fa fa-search"></i><fmt:message key="button.search"/> </button>
</div>
</div> </div>
...@@ -95,7 +92,7 @@ ...@@ -95,7 +92,7 @@
</form:select> </form:select>
</div> </div>
<label class="control-label col-md-1"><fmt:message key="component.partNumber"/></label> <label class="control-label col-md-1"><fmt:message key="barcode.partNumber"/></label>
<input type="hidden" name="expire" value="${expire}"/> <input type="hidden" name="expire" value="${expire}"/>
<div class="col-md-2"> <div class="col-md-2">
...@@ -121,11 +118,15 @@ ...@@ -121,11 +118,15 @@
<label class="control-label col-md-1"><fmt:message key="barcode.memo"/></label> <%-- <label class="control-label col-md-1"><fmt:message key="barcode.memo"/></label>--%>
<div class="col-md-2"> <%-- <div class="col-md-2">--%>
<div style="text-align:left"> <%-- <div style="text-align:left">--%>
<input id="memo" name="memo" class="form-control" value="${memo}"/> <%-- <input id="memo" name="memo" class="form-control" value="${memo}"/>--%>
</div> <%-- </div>--%>
<%-- </div>--%>
<div class="col-md-3">
<button class="btn purple left" type="submit"><i class="fa fa-search"></i><fmt:message key="button.search"/> </button>
</div> </div>
</div> </div>
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<c:set var="today" value="<%= new Date()%>"/> <c:set var="today" value="<%= new Date()%>"/>
<display:table name="searchCriteria.pageList" requestURI="storagePosFind.html" sort="external" <display:table name="searchCriteria.pageList" requestURI="storagePosFind.html" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="true" defaultsort="1" class="table table-bordered blue-steel" export="true"
id="pos" > id="pos" >
<display:setProperty name="export.csv.filename" value="export.csv" /> <display:setProperty name="export.csv.filename" value="export.csv" />
<c:set var="expireClass" value=""/> <c:set var="expireClass" value=""/>
......
myproject/src/main/webapp/WEB-INF/pages/dataLog/dataLogSearch.jsp
...@@ -99,7 +99,7 @@ ...@@ -99,7 +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> <%--<button class="btn" id="exitSystem" onclick="CloseWebPage()">AAAA</button>--%>
</div> </div>
</div> </div>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="search.html" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="search.html"
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="true" defaultsort="1" class="table table-bordered blue-steel" export="true"
id="dataLog"> id="dataLog">
<display:setProperty name="export.csv.filename" value="dataLog.csv" /> <display:setProperty name="export.csv.filename" value="dataLog.csv" />
<display:column property="partNumber" titleKey="dataLog.partNumber" sortable="true" sortProperty="partNumber"/> <display:column property="partNumber" titleKey="dataLog.partNumber" sortable="true" sortProperty="partNumber"/>
......
myproject/src/main/webapp/WEB-INF/pages/homeMenu.jsp
...@@ -9,83 +9,102 @@ ...@@ -9,83 +9,102 @@
padding: 10px; padding: 10px;
} }
.menuImg{ .menuImg{
width:60%; /*width:60%;*/
margin-bottom:5px;
} }
.menuItem{ .menuItem{
margin:15px 0px; margin-top: 100px;
} }
</style> </style>
<div class="bg-grey-gallery"> <div class="">
<div class="clearfix"> <div class="clearfix">
</div> </div>
<div class="row iconMenu"> <div class="row">
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT">
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/storage/boxChart.html"> <a href="${ctx}/storage/boxChart.html">
<img src="${ctx}/images/menu/10.png" class="menuImg"/> <img src="${ctx}/images/menu/kanban.png" class="menuImg"/>
<div>KANBAN</div> <%--<div>KANBAN</div>--%>
</a> </a>
</div> </div>
</security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_COMPONENT">
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/component/componentSearch.html?type=0"> <%--<a href="${ctx}/component/componentSearch.html?type=0">--%>
<img src="${ctx}/images/menu/4.png" class="menuImg"/> <img src="${ctx}/images/menu/neobot.png" class="menuImg"/>
<div><fmt:message key="menu.product"/></div> <%--<div><fmt:message key="menu.product"/></div>--%>
<%--</a>--%>
</div>
<div class="col-md-2 col-xs-4 menuItem">
<%--<a href="${ctx}/component/storagePosFind.html">--%>
<img src="${ctx}/images/menu/neolight.png" class="menuImg"/>
<%--<div><fmt:message key="menu.order"/></div>--%>
<%--</a>--%>
</div>
<div class="col-md-2 col-xs-4 menuItem">
<%--<a href="${ctx}/component/inventory.html">--%>
<img src="${ctx}/images/menu/neox.png" class="menuImg"/>
<%--<div><fmt:message key="menu.cloud"/></div>--%>
<%--</a>--%>
</div>
<div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/storage/storageSearch.html">
<img src="${ctx}/images/menu/smdbox.png" class="menuImg"/>
<%--<div><fmt:message key="menu.barCode"/></div>--%>
</a> </a>
</div> </div>
</security:authorize> <div class="col-md-2 col-xs-4 menuItem">
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT, ROLE_MANAGE_FEEDER"> <%--<a href="${ctx}/dataLog/search.html">--%>
<img src="${ctx}/images/menu/neoscan.png" class="menuImg"/>
<%--<div><fmt:message key="menu.bigdata"/></div>--%>
<%--</a>--%>
</div>
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/component/storagePosFind.html"> <a href="${ctx}/component/storagePosFind.html">
<img src="${ctx}/images/menu/5.png" class="menuImg"/> <img src="${ctx}/images/menu/lightOrder.png?id=1" class="menuImg"/>
<div><fmt:message key="menu.order"/></div> <%--<div><fmt:message key="menu.system"/></div>--%>
</a> </a>
</div> </div>
</security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT">
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/component/inventory.html"> <a href="${ctx}/component/componentSearch.html?type=0">
<img src="${ctx}/images/menu/9.png" class="menuImg"/> <img src="${ctx}/images/menu/productInfo.png" class="menuImg"/>
<div><fmt:message key="menu.cloud"/></div> <%--<div><fmt:message key="menu.system"/></div>--%>
</a> </a>
</div> </div>
</security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_BARCODE">
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/barcode/barcodeSearch.html"> <a href="${ctx}/barcode/barcodeSearch.html">
<img src="${ctx}/images/menu/2.png" class="menuImg"/> <img src="${ctx}/images/menu/materialId.png" class="menuImg"/>
<div><fmt:message key="menu.barCode"/></div> <%--<div><fmt:message key="menu.system"/></div>--%>
</a> </a>
</div> </div>
</security:authorize> <div class="col-md-2 col-xs-4 menuItem">
<a href="teamviewer8://remotecontrol">
<security:authorize ifAnyGranted="ROLE_MANAGE_DATALOG"> <img src="${ctx}/images/menu/remoteDesktop.png?id=1" class="menuImg"/>
<%--<div><fmt:message key="menu.system"/></div>--%>
</a>
</div>
<div class="col-md-2 col-xs-4 menuItem">
<%--<a href="${ctx}/system/settings.html">--%>
<img src="${ctx}/images/menu/virtualDesktop.png" class="menuImg"/>
<%--<div><fmt:message key="menu.system"/></div>--%>
<%--</a>--%>
</div>
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/dataLog/search.html"> <a href="${ctx}/dataLog/search.html">
<img src="${ctx}/images/menu/1.png" class="menuImg"/> <img src="${ctx}/images/menu/bigData.png" class="menuImg"/>
<div><fmt:message key="menu.bigdata"/></div> <%--<div><fmt:message key="menu.system"/></div>--%>
</a> </a>
</div> </div>
</security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_USER,ROLE_MANAGE_ROLE">
<div class="col-md-2 col-xs-4 menuItem"> <div class="col-md-2 col-xs-4 menuItem">
<a href="${ctx}/system/settings.html"> <a href="${ctx}/system/settings.html">
<img src="${ctx}/images/menu/6.png" class="menuImg"/> <img src="${ctx}/images/menu/system.png" class="menuImg"/>
<div><fmt:message key="menu.system"/></div> <%--<div><fmt:message key="menu.system"/></div>--%>
</a> </a>
</div> </div>
</div> </div>
</security:authorize>
</div> </div>
<c:set var="scripts" scope="request"> <c:set var="scripts" scope="request">
<script type="text/javascript"> <script type="text/javascript">
$(".page-content").addClass("bg-grey-gallery"); //$(".page-content").addClass("grey-gallery");
</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/robot/robotRecords.jsp
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div></div> </div></div>
</div> </div>
<div class="table-scrollable"> <div class="table-scrollable">
<table class="table table-striped table-bordered table-hover" > <table class="table table-bordered blue-steel" >
<thead> <thead>
<th>条码</th> <th>条码</th>
<th>工单</th> <th>工单</th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/accShelf.jsp
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
<th><fmt:message key="barcode.barcode"/></th> <th><fmt:message key="barcode.barcode"/></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
height:86px; height:86px;
} }
.kanban { .kanban {
background-color: #dad9da; background-color: #131213;
min-height: 620px;} min-height: 620px;}
.itembox{ .itembox{
margin: 10px 0px; margin: 10px 0px;
...@@ -158,15 +158,16 @@ ...@@ -158,15 +158,16 @@
<link href="${ctx}/scripts/lobibox/css/lobibox.min.css?id=2" rel="stylesheet" type="text/css"/> <link href="${ctx}/scripts/lobibox/css/lobibox.min.css?id=2" rel="stylesheet" type="text/css"/>
<div class="kanban row"> <div class="kanban row">
<div class="bg-primary kabanTitle col-md-12"> <div class="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> <div id="lineMsg"></div>
<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> <button class="btn yellow outBtn right" id="outPn"><i class="fa fa-upload"></i><fmt:message key="button.checkout"/></button>
<button class="btn yellow outBtn right" id="outOrder"><i class="fa fa-folder"></i><fmt:message key="menu.order"/></button>
</div> </div>
</div> </div>
<c:forEach items="${allStorage}" var="storage"> <c:forEach items="${allStorage}" var="storage">
...@@ -205,7 +206,7 @@ ...@@ -205,7 +206,7 @@
<c:set var="detailUrl" value="${ctx}/storage/xl/${storage.cid}"/> <c:set var="detailUrl" value="${ctx}/storage/xl/${storage.cid}"/>
</c:if> </c:if>
<div class="portlet box green-haze tasks-widget"> <div class="portlet box grey-gallery tasks-widget">
<c:choose> <c:choose>
<c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual || storage.codeShelf}"> <c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual || storage.codeShelf}">
<%--智能料架--%> <%--智能料架--%>
...@@ -284,9 +285,9 @@ ...@@ -284,9 +285,9 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div id="footerBtn"> <%-- <div id="footerBtn">--%>
<a href="" class="btn yellow left" id="findAndOut"><i class="fa fa-upload"></i><fmt:message key="allBoxView.findAndOut"/></a> <%-- <a href="" class="btn yellow left" id="findAndOut"><i class="fa fa-upload"></i><fmt:message key="allBoxView.findAndOut"/></a>--%>
</div> <%-- </div>--%>
<%--<button type="button" data-dismiss="modal" class="btn default" id="cancelAuthBtn">取消</button>--%> <%--<button type="button" data-dismiss="modal" class="btn default" id="cancelAuthBtn">取消</button>--%>
</div> </div>
</div> </div>
...@@ -332,7 +333,7 @@ ...@@ -332,7 +333,7 @@
<input type="text" class="form-control filterInput" id="searchOrderItemPn"/> <input type="text" class="form-control filterInput" id="searchOrderItemPn"/>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<table class="table table-striped table-hover" id="orderItemsTable"> <table class="table blue-steel" id="orderItemsTable">
<thead> <thead>
<tr> <tr>
<th> <th>
...@@ -342,6 +343,9 @@ ...@@ -342,6 +343,9 @@
<fmt:message key="barcode.partNumber"/> <fmt:message key="barcode.partNumber"/>
</th> </th>
<th> <th>
<fmt:message key="barcode.barcode"/>
</th>
<th>
<fmt:message key="order.feeder"/> <fmt:message key="order.feeder"/>
</th> </th>
<th> <th>
...@@ -437,6 +441,7 @@ ...@@ -437,6 +441,7 @@
<fmt:message key="allBoxView.used" var="used_label"/> <fmt:message key="allBoxView.used" var="used_label"/>
<fmt:message key="allBoxView.noReel" var="noReel_label"/> <fmt:message key="allBoxView.noReel" var="noReel_label"/>
<fmt:message key="allBoxView.noOrder" var="noOrder_label"/>
<fmt:message key="allBoxView.msg.title" var="msg_title"/> <fmt:message key="allBoxView.msg.title" var="msg_title"/>
<fmt:message key="allBoxView.msg.cancelMsg" var="cancel_msg"/> <fmt:message key="allBoxView.msg.cancelMsg" var="cancel_msg"/>
<fmt:message key="allBoxView.msg.cancelFinished" var="cancelFinished_msg"/> <fmt:message key="allBoxView.msg.cancelFinished" var="cancelFinished_msg"/>
...@@ -502,7 +507,7 @@ ...@@ -502,7 +507,7 @@
"<div class='"+bgColors[index%bgColors.length]+" partnumber-box'>"+orderNo+"</div></div>"; "<div class='"+bgColors[index%bgColors.length]+" partnumber-box'>"+orderNo+"</div></div>";
} }
if(itemStr == ""){ if(itemStr == ""){
itemStr = "<div style='font-size: 20px;text-align: center;'>${noReel_label}</div>"; itemStr = "<div style='font-size: 20px;text-align: center;'>${noOrder_label}</div>";
} }
$(".theItems").html(itemStr); $(".theItems").html(itemStr);
}); });
...@@ -543,7 +548,7 @@ ...@@ -543,7 +548,7 @@
// opStr = ""; // opStr = "";
// } // }
var needQty = data[i].needNum + " x " + order.orderTimes; var needQty = data[i].needNum + " x " + order.orderTimes;
table.row.add( [ i, data[i].pn, data[i].feederInfo,needQty,data[i].outNum,data[i].inventoryNum,opStr] ); table.row.add( [ i, data[i].pn, data[i].reelId, data[i].feederInfo,needQty,data[i].outNum,data[i].inventoryNum,opStr] );
} }
table.order( [ 3, 'asc' ] ).draw(); table.order( [ 3, 'asc' ] ).draw();
......
myproject/src/main/webapp/WEB-INF/pages/storage/areaUpdate.jsp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-pencil"></i><fmt:message key="menu.area.search"/> <i class="fa fa-pencil"></i><fmt:message key="menu.area.search"/>
......
myproject/src/main/webapp/WEB-INF/pages/storage/batchBoxView.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
font-size: 15px; font-size: 15px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
padding-top: 35px; padding-top: 25px;
border:2px solid #FFFFFF !important; border:2px solid #FFFFFF !important;
} }
#confirmReelOut{ #confirmReelOut{
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
} }
.item-start{ .item-start{
float: left; float: left;
width: 12%; width: 14%;
font-size: 18px; font-size: 18px;
} }
.my-progress { .my-progress {
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
color: #ff5500; color: #ff5500;
} }
#smdstatus{ #smdstatus{
line-height: 100px; /*line-height: 100px;*/
font-size: 20px; font-size: 20px;
} }
.barheight{ .barheight{
...@@ -96,10 +96,10 @@ ...@@ -96,10 +96,10 @@
line-height: 25px; line-height: 25px;
} }
.btn{ .btn{
width: 120px; /*width: 140px;*/
height: 40px; height: 40px;
float: right; float: right;
margin-right: 30px; margin-right: 10px;
} }
.partnumber-box{ .partnumber-box{
...@@ -130,11 +130,11 @@ ...@@ -130,11 +130,11 @@
<fmt:message key="batch.btn.singleOut" var="singleOutBtn"/> <fmt:message key="batch.btn.singleOut" var="singleOutBtn"/>
<fmt:message key="batch.btn.batchOut" var="batchOutBtn"/> <fmt:message key="batch.btn.batchOut" var="batchOutBtn"/>
<div class="kanban"> <div class="kanban">
<div class="bg-primary kabanTitle"><span>${storageName}</span><span style="margin-left: 40px;" id="storageTotalPos"><fmt:message key="allBoxView.capacity"/>:1000</span> <div class="bg-primary kabanTitle"><span>${storageName}</span><span style="margin-left: 20px;" id="storageTotalPos"><fmt:message key="allBoxView.capacity"/>:1000</span>
<button class="btn yellow outBtn"> <button class="btn yellow outBtn">
<i class="fa fa-sign-out"></i><fmt:message key="batch.btn.singleOut"/></button> <fmt:message key="batch.btn.singleOut"/></button>
<button class="btn yellow batchOutBtn"> <button class="btn yellow batchOutBtn">
<i class="fa fa-sign-out"></i><fmt:message key="batch.btn.batchOut"/></button> <fmt:message key="batch.btn.batchOut"/></button>
</div> </div>
<input type="hidden" id="outType" value="single"/> <input type="hidden" id="outType" value="single"/>
<div id="chart"> <div id="chart">
...@@ -155,15 +155,21 @@ ...@@ -155,15 +155,21 @@
<%--</div>--%> <%--</div>--%>
</div> </div>
<div class="clientOpBox" style="height:220px;"> <div class="clientOpBox" style="height:320px;">
<div class="col-md-4"> <div class="col-md-12" style="margin-top: 5px;margin-bottom:10px;">
<div class="col-md-6" style="margin-top: 45px;"> <div class="col-md-4">
<div class="boxtemperature" style="font-size: 16px;"><fmt:message key="allBoxView.temperature"/>:-</div><div><fmt:message key="boxView.range"/>:${minTemperature}-${maxTemperature}℃</div> <div class="boxtemperature" style="font-size: 16px;"><fmt:message key="allBoxView.temperature"/>:-</div><div><fmt:message key="boxView.range"/>:${minTemperature}-${maxTemperature}℃</div>
<div class="boxhumidity" style="font-size: 16px;margin-top:10px;"><fmt:message key="allBoxView.humidity"/>:-</div><div><fmt:message key="boxView.range"/>:${minHumidity}-${maxHumidity}%</div>
</div> </div>
<div class="col-md-4">
</div>
<div class="col-md-4" style="text-align: center;">
<div class="boxhumidity" style="font-size: 16px;"><fmt:message key="allBoxView.humidity"/>:-</div><div><fmt:message key="boxView.range"/>:${minHumidity}-${maxHumidity}%</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-6"> <div class="col-md-12">
<div class="col-md-12 bg-yellow sm-btn-box " id="singleReelIn"> <div class="col-md-12 bg-yellow sm-btn-box " id="singleReelIn">
<fmt:message key="batch.btn.singleIn"/> <fmt:message key="batch.btn.singleIn"/>
</div> </div>
...@@ -174,8 +180,10 @@ ...@@ -174,8 +180,10 @@
</div> </div>
<div class="col-md-4" style="text-align:center;"> <div class="col-md-4" style="text-align:center;">
<%--<div style="font-size:20px;" id="doorStatus"></div>--%> <%--<div style="font-size:20px;" id="doorStatus"></div>--%>
<div id="smdstatus"></div> <div class="col-md-12">
<div id="clientMsg"></div> <div id="smdstatus"></div>
<div id="clientMsg"></div>
</div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
...@@ -215,7 +223,7 @@ ...@@ -215,7 +223,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div id="footerBtn"> <div id="footerBtn">
<a href="" class="btn yellow left" id="findAndOut"><i class="fa fa-sign-out"></i><fmt:message key="allBoxView.findAndOut"/></a> <a href="" class="btn yellow left" style="width:160px;" id="findAndOut"><fmt:message key="allBoxView.findAndOut"/></a>
<button type="button" class="btn green" onclick="lastPage()" id="lastPage"><fmt:message key="allBoxView.lastPage"/></button> <button type="button" class="btn green" onclick="lastPage()" id="lastPage"><fmt:message key="allBoxView.lastPage"/></button>
<button type="button" class="btn green" onclick="nextPage()" id="nextPage"><fmt:message key="allBoxView.nextPage"/></button> <button type="button" class="btn green" onclick="nextPage()" id="nextPage"><fmt:message key="allBoxView.nextPage"/></button>
...@@ -250,6 +258,7 @@ ...@@ -250,6 +258,7 @@
<fmt:message key="allBoxView.used" var="used_label"/> <fmt:message key="allBoxView.used" var="used_label"/>
<fmt:message key="allBoxView.noReel" var="noReel_label"/> <fmt:message key="allBoxView.noReel" var="noReel_label"/>
<fmt:message key="allBoxView.noOrder" var="noOrder_label"/>
<fmt:message key="allBoxView.msg.title" var="msg_title"/> <fmt:message key="allBoxView.msg.title" var="msg_title"/>
<fmt:message key="allBoxView.msg.cancelMsg" var="cancel_msg"/> <fmt:message key="allBoxView.msg.cancelMsg" var="cancel_msg"/>
<fmt:message key="allBoxView.msg.cancelFinished" var="cancelFinished_msg"/> <fmt:message key="allBoxView.msg.cancelFinished" var="cancelFinished_msg"/>
...@@ -277,6 +286,7 @@ ...@@ -277,6 +286,7 @@
sound: false, sound: false,
delay: false, delay: false,
position: 'bottom right', position: 'bottom right',
width: 300
}); });
$(".outBtn").click(function(){ $(".outBtn").click(function(){
...@@ -404,7 +414,7 @@ ...@@ -404,7 +414,7 @@
} }
} }
if(itemStr == ""){ if(itemStr == ""){
itemStr = "<div style='font-size: 20px;text-align: center;'>${noReel_label}</div>"; itemStr = "<div style='font-size: 20px;text-align: center;'>${noOrder_label}</div>";
} }
$("#partNumberItems").html(itemStr); $("#partNumberItems").html(itemStr);
} }
...@@ -593,11 +603,30 @@ ...@@ -593,11 +603,30 @@
$.post("${ctx}/service/store/getStorage", {cid: '${show}'}, function (storage) { $.post("${ctx}/service/store/getStorage", {cid: '${show}'}, function (storage) {
if(!isLimitOpt(storage)){ if(!isLimitOpt(storage)){
var sizeData = storage.usageMap; var sizeData = storage.usageMap;
var sizeItemArr = new Array();
for(var sizeStr in sizeData){
sizeItemArr.push(sizeData[sizeStr]);
}
sizeItemArr.sort(function(a, b){
if (a.w == b.w) {
if(a.h < b.h){
return -1;
}else{
return 1;
}
}
if (a.w < b.w) {
return -1;}
else{
return 1;
}
return 0;
});
var cid = storage.cid; var cid = storage.cid;
var totalCount = storage.totalSlots; var totalCount = storage.totalSlots;
for(var sizeStr in sizeData){ for(var i in sizeItemArr) {
var sizeItem = sizeData[sizeStr]; var sizeItem = sizeItemArr[i];
var sizeStr = sizeItem.sizeStr;
var idleCount = sizeItem.totalCount - sizeItem.usedCount; var idleCount = sizeItem.totalCount - sizeItem.usedCount;
var html = getItemBar(sizeItem["w"],sizeItem["h"],sizeItem["usedCount"],idleCount); var html = getItemBar(sizeItem["w"],sizeItem["h"],sizeItem["usedCount"],idleCount);
var sizeDom = $("#"+sizeStr); var sizeDom = $("#"+sizeStr);
...@@ -663,6 +692,7 @@ ...@@ -663,6 +692,7 @@
var statusTxt = statusMsg["999"]; var statusTxt = statusMsg["999"];
$("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]"); $("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]");
$("#clientMsg").html(""); $("#clientMsg").html("");
$("#clientMsg").html(statusBean.msg);
//$("#doorStatus").html("${doorStatus_label}: --"); //$("#doorStatus").html("${doorStatus_label}: --");
} }
}); });
......
myproject/src/main/webapp/WEB-INF/pages/storage/codeShelf.jsp
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
<div class="actions"> <div class="actions">
<%--<button type="button" class="btn btn-fit-height default" onclick="checkAllPos();">--%> <button type="button" class="btn btn-fit-height default" onclick="checkAllPos();">
<%--<fmt:message key="shelf.btn.posCheck"/>--%> <fmt:message key="shelf.btn.posCheck"/>
<%--</button>--%> </button>
<%--<button type="button" class="btn btn-fit-height default" onclick="closeAllLights();">--%> <button type="button" class="btn btn-fit-height default" onclick="closeAllLights();">
<%--<fmt:message key="shelf.btn.closeAll"/>--%> <fmt:message key="shelf.btn.closeAll"/>
<%--</button>--%> </button>
<div class="btn-group"> <div class="btn-group">
<a href="" class="btn grey-steel btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true"> <a href="" class="btn grey-steel btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
<th><fmt:message key="barcode.barcode"/></th> <th><fmt:message key="barcode.barcode"/></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/smdXl.jsp
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:600px;"> <div class="table-scrollable" style="height:600px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list">
<thead> <thead>
<tr role="row"> <tr role="row">
<th><fmt:message key="checkOut.pos"/></th> <th><fmt:message key="checkOut.pos"/></th>
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list">
<thead> <thead>
<tr role="row"> <tr role="row">
<th></th> <th></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/solderBox.jsp
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
<th></th> <th></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/storageBoxView.jsp
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<c:set var="scripts" scope="request"> <c:set var="scripts" scope="request">
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
var boxColors=["blue-madison","green-haze","red-intense","purple-plum","yellow-casablanca","blue-hoki","green-jungle"]; var boxColors=["blue-madison","green-haze","red-intense","purple-plum","yellow-casablanca","blue-hoki","blue-steel"];
var statusMsg={ var statusMsg={
"1":"${status_1}", "1":"${status_1}",
......
myproject/src/main/webapp/WEB-INF/pages/storage/storageSearch.jsp
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</form:form> </form:form>
<display:table name="searchCriteria.pageList" id="storage" <display:table name="searchCriteria.pageList" id="storage"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" requestURI="storageSearch.html"> defaultsort="1" class="table table-bordered blue-steel" export="false" requestURI="storageSearch.html">
<display:column property="name" escapeXml="true" titleKey="storage.name"/> <display:column property="name" escapeXml="true" titleKey="storage.name"/>
<display:column titleKey="storage.type" property="type"/> <display:column titleKey="storage.type" property="type"/>
......
myproject/src/main/webapp/WEB-INF/pages/storage/storageUpdate.jsp
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-pencil"></i><fmt:message key="storage.update.subtitle"/> <i class="fa fa-pencil"></i><fmt:message key="storage.update.subtitle"/>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<table id="componentList" <table id="componentList"
class="table table-striped table-hover table-bordered dataTable no-footer" role="grid" class="table blue-steel table-bordered dataTable no-footer" role="grid"
aria-describedby="sample_editable_1_info"> aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<table id="posList" <table id="posList"
class="table table-striped table-hover table-bordered dataTable no-footer" role="grid" class="table blue-steel table-bordered dataTable no-footer" role="grid"
aria-describedby="sample_editable_1_info"> aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
......
myproject/src/main/webapp/WEB-INF/pages/storage/verticalBox.jsp
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list">
<thead> <thead>
<tr role="row"> <tr role="row">
<th><fmt:message key="checkOut.pos"/></th> <th><fmt:message key="checkOut.pos"/></th>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info" id="list">
<thead> <thead>
<tr role="row"> <tr role="row">
<th></th> <th></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/virtualBox.jsp
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="table-scrollable" style="height:400px;"> <div class="table-scrollable" style="height:400px;">
<table class="table table-striped table-hover table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info"> <table class="table blue-steel table-bordered no-footer" role="grid" aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr role="row"> <tr role="row">
<th><fmt:message key="barcode.barcode"/></th> <th><fmt:message key="barcode.barcode"/></th>
......
myproject/src/main/webapp/WEB-INF/pages/storage/virtualStorage.jsp
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<table id="logTable" <table id="logTable"
class="table table-striped table-hover table-bordered dataTable no-footer" role="grid" class="table blue-steel table-bordered dataTable no-footer" role="grid"
aria-describedby="sample_editable_1_info"> aria-describedby="sample_editable_1_info">
<thead> <thead>
<tr> <tr>
......
myproject/src/main/webapp/WEB-INF/pages/system/dataReport.jsp
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="row" style="padding:10px"> <div class="row" style="padding:10px">
<div class="table-scrollable"> <div class="table-scrollable">
<table class="table table-striped table-hover table-bordered dataTable no-footer" role="grid" <table class="table blue-steel table-bordered dataTable no-footer" role="grid"
aria-describedby="sample_editable_1_info> aria-describedby="sample_editable_1_info>
<thead> <thead>
<tr role="row"> <tr role="row">
......
myproject/src/main/webapp/WEB-INF/pages/system/inOutList.jsp
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="table-scrollable"> <div class="table-scrollable">
<display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI="" <display:table name="searchCriteria.pageList" cellspacing="0" cellpadding="0" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="true" defaultsort="1" class="table table-bordered blue-steel" export="true"
id="barcode"> id="barcode">
<display:setProperty name="export.csv.filename" value="outList.csv" /> <display:setProperty name="export.csv.filename" value="outList.csv" />
......
myproject/src/main/webapp/WEB-INF/pages/system/maintenance.jsp
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
"<div class='portlet-title'><div class='caption' id='"+cid+"'>"+storageName+"</div><div class='tools'>${nextTime}:"+nextTime+ "<div class='portlet-title'><div class='caption' id='"+cid+"'>"+storageName+"</div><div class='tools'>${nextTime}:"+nextTime+
"<a href='#cid' data-toggle='modal' class='config' onclick='showConfig(\""+cid+"\")'></a></div></div>"; "<a href='#cid' data-toggle='modal' class='config' onclick='showConfig(\""+cid+"\")'></a></div></div>";
var detailHtml = "<div class='portlet-body' style='height: auto;'>" + var detailHtml = "<div class='portlet-body' style='height: auto;'>" +
"<table class='table table-bordered table-hover'>" + "<table class='table table-bordered blue-steel'>" +
"<thead><tr><th>#</th><th>${deviceName}</th><th>${runTime}</th><th>${status}</th></tr></thead><tbody>"; "<thead><tr><th>#</th><th>${deviceName}</th><th>${runTime}</th><th>${status}</th></tr></thead><tbody>";
var deviceInfos = data[item].deviceData; var deviceInfos = data[item].deviceData;
var index = 0; var index = 0;
......
myproject/src/main/webapp/WEB-INF/pages/system/runStatus.jsp
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="table-scrollable"> <div class="table-scrollable">
<table class="table table-striped table-hover"> <table class="table blue-steel">
<thead> <thead>
<tr> <tr>
<th> <th>
......
myproject/src/main/webapp/WEB-INF/pages/user/roleSearch.jsp
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<display:table name="roles" class="table table-striped table-bordered table-hover" partialList="list"> <display:table name="roles" class="table table-bordered blue-steel" partialList="list">
<display:column property="name" sortable="false" titleKey="role.update.name" <display:column property="name" sortable="false" titleKey="role.update.name"
url="/user/roleUpdate.html" paramId="id" paramProperty="id"/> url="/user/roleUpdate.html" paramId="id" paramProperty="id"/>
<display:column property="description" titleKey="role.update.description"/> <display:column property="description" titleKey="role.update.description"/>
......
myproject/src/main/webapp/WEB-INF/pages/user/userList.jsp
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<display:table name="userList" requestURI="" <display:table name="userList" requestURI=""
sort="external" id="user" sort="external" id="user"
defaultsort="1" class="table table-striped table-bordered table-hover" defaultsort="1" class="table table-bordered"
export="false"> export="false">
<display:column property="username" escapeXml="true" titleKey="user.username" url="/user/userUpdate.html" <display:column property="username" escapeXml="true" titleKey="user.username" url="/user/userUpdate.html"
paramId="id" paramProperty="id"/> paramId="id" paramProperty="id"/>
......
myproject/src/main/webapp/WEB-INF/pages/user/userUpdate.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PORTLET--> <!-- BEGIN PORTLET-->
<div class="portlet box green-jungle"> <div class="portlet box blue-steel">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-pencil"></i><fmt:message key="user.update.subtitle"/> <i class="fa fa-pencil"></i><fmt:message key="user.update.subtitle"/>
......
myproject/src/main/webapp/WEB-INF/pages/workOrder/liteOrderSearch.jsp
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</form> </form>
<display:table name="searchCriteria.pageList" requestURI="" <display:table name="searchCriteria.pageList" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="liteOrder"> defaultsort="1" class="table table-bordered blue-steel" export="false" id="liteOrder">
<display:column titleKey="workOrder.name" sortable="true" sortProperty="orderNo"> <display:column titleKey="workOrder.name" sortable="true" sortProperty="orderNo">
<a href="#" onclick="showOrderDetail('${liteOrder.orderNo}')">${liteOrder.orderNo}</a> <a href="#" onclick="showOrderDetail('${liteOrder.orderNo}')">${liteOrder.orderNo}</a>
</display:column> </display:column>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<input type="text" class="form-control filterInput" id="searchOrderItemPn"/> <input type="text" class="form-control filterInput" id="searchOrderItemPn"/>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<table class="table table-striped table-hover" id="orderItemsTable"> <table class="table blue-steel" id="orderItemsTable">
<thead> <thead>
<tr> <tr>
<th> <th>
...@@ -96,6 +96,9 @@ ...@@ -96,6 +96,9 @@
<fmt:message key="barcode.partNumber"/> <fmt:message key="barcode.partNumber"/>
</th> </th>
<th> <th>
<fmt:message key="barcode.barcode"/>
</th>
<th>
<fmt:message key="order.feeder"/> <fmt:message key="order.feeder"/>
</th> </th>
<th> <th>
...@@ -136,7 +139,7 @@ ...@@ -136,7 +139,7 @@
for(var i in data){ for(var i in data){
var needQty = data[i].needNum + " x " + order.orderTimes; var needQty = data[i].needNum + " x " + order.orderTimes;
table.row.add( [ i, data[i].pn, data[i].feederInfo,needQty, data[i].outNum,data[i].inventoryNum] ); table.row.add( [ i, data[i].pn,data[i].reelId, data[i].feederInfo,needQty, data[i].outNum,data[i].inventoryNum] );
} }
table.order( [ 3, 'asc' ] ).draw(); table.order( [ 3, 'asc' ] ).draw();
......
myproject/src/main/webapp/assets/admin/layout/css/layout.css
...@@ -1247,7 +1247,7 @@ Page sidebar ...@@ -1247,7 +1247,7 @@ Page sidebar
margin-right: -100%; margin-right: -100%;
} }
.page-full-width .page-sidebar { .page-full-width .page-sidebar {
display: none !important; display: block !important;
} }
.page-sidebar.navbar-collapse { .page-sidebar.navbar-collapse {
max-height: none !important; max-height: none !important;
...@@ -2195,7 +2195,7 @@ Page content ...@@ -2195,7 +2195,7 @@ Page content
.page-content { .page-content {
margin-top: 0px; margin-top: 0px;
padding: 0px; padding: 0px;
background-color: #fff; background-color: #222;
} }
.page-container-bg-solid .page-content { .page-container-bg-solid .page-content {
background: #f1f3fa; background: #f1f3fa;
......
myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png
myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png

6.5 KB | 宽: | 高:

myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png

3.8 KB | 宽: | 高:

myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png
myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png
myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png
myproject/src/main/webapp/assets/admin/layout/img/smdboxlogo1.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
myproject/src/main/webapp/assets/admin/pages/css/inbox.css
...@@ -204,8 +204,8 @@ Inbox Page ...@@ -204,8 +204,8 @@ Inbox Page
.inbox .table-hover tbody tr:hover > td, .inbox .table-hover tbody tr:hover > td,
.inbox .table-hover tbody tr:hover > th, .inbox .table-hover tbody tr:hover > th,
.inbox .table-striped tbody > tr:nth-child(odd) > td, .inbox .tbody > tr:nth-child(odd) > td,
.inbox .table-striped tbody > tr:nth-child(odd) > th { .inbox .tbody > tr:nth-child(odd) > th {
background: #f8fbfd; background: #f8fbfd;
cursor: pointer; cursor: pointer;
} }
......
myproject/src/main/webapp/assets/admin/pages/css/login.css
...@@ -3,7 +3,7 @@ Login page ...@@ -3,7 +3,7 @@ Login page
***/ ***/
/* bg color */ /* bg color */
.login { .login {
background-color: #364150 !important; background-color: #000 !important;
} }
.login .logo { .login .logo {
...@@ -14,7 +14,7 @@ Login page ...@@ -14,7 +14,7 @@ Login page
} }
.login .content { .login .content {
background-color: #eceef1; background-color: #333;
-webkit-border-radius: 7px; -webkit-border-radius: 7px;
-moz-border-radius: 7px; -moz-border-radius: 7px;
-ms-border-radius: 7px; -ms-border-radius: 7px;
...@@ -53,23 +53,23 @@ Login page ...@@ -53,23 +53,23 @@ Login page
.login .content .form-control { .login .content .form-control {
border: none; border: none;
background-color: #dde3ec; background-color: #121213;
height: 43px; height: 43px;
color: #8290a3; color: #FFF;
border: 1px solid #dde3ec; border: 1px solid #dde3ec;
} }
.login .content .form-control:focus, .login .content .form-control:active { .login .content .form-control:focus, .login .content .form-control:active {
border: 1px solid #c3ccda; border: 1px solid #c3ccda;
} }
.login .content .form-control::-moz-placeholder { .login .content .form-control::-moz-placeholder {
color: #8290a3; color: #FFF;
opacity: 1; opacity: 1;
} }
.login .content .form-control:-ms-input-placeholder { .login .content .form-control:-ms-input-placeholder {
color: #8290a3; color: #FFF;
} }
.login .content .form-control::-webkit-input-placeholder { .login .content .form-control::-webkit-input-placeholder {
color: #8290a3; color: #FFF;
} }
.login .content select.form-control { .login .content select.form-control {
...@@ -91,12 +91,7 @@ Login page ...@@ -91,12 +91,7 @@ Login page
} }
.login .content .form-actions { .login .content .form-actions {
clear: both; text-align: center;
border: 0px;
border-bottom: 1px solid #eee;
padding: 0px 30px 25px 30px;
margin-left: -30px;
margin-right: -30px;
} }
.login-options { .login-options {
......
myproject/src/main/webapp/assets/global/css/components.css
...@@ -2145,7 +2145,7 @@ Form Layouts ...@@ -2145,7 +2145,7 @@ Form Layouts
.form .form-actions { .form .form-actions {
padding: 20px 10px; padding: 20px 10px;
margin: 0; margin: 0;
background-color: #f5f5f5; background-color: #1b1b1b;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
*zoom: 1; *zoom: 1;
} }
...@@ -2289,6 +2289,8 @@ Form Layouts ...@@ -2289,6 +2289,8 @@ Form Layouts
.form .form-bordered .form-group { .form .form-bordered .form-group {
margin: 0; margin: 0;
border-bottom: 1px solid #efefef; border-bottom: 1px solid #efefef;
background-color: #444;
color: #FFF;
} }
.form .form-bordered .form-group > div { .form .form-bordered .form-group > div {
padding: 15px; padding: 15px;
...@@ -2371,8 +2373,8 @@ Forms ...@@ -2371,8 +2373,8 @@ Forms
.form-control { .form-control {
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
color: #333333; color: #fff;
background-color: white; background-color: #2c2c2c;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
...@@ -2387,7 +2389,7 @@ Forms ...@@ -2387,7 +2389,7 @@ Forms
} }
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
cursor: not-allowed; cursor: not-allowed;
background-color: #eeeeee; background-color: #666;
} }
.form-control.height-auto { .form-control.height-auto {
height: auto; height: auto;
...@@ -3854,7 +3856,8 @@ Portlets ...@@ -3854,7 +3856,8 @@ Portlets
padding: 7px 0 5px 0; padding: 7px 0 5px 0;
} }
.portlet.box > .portlet-body { .portlet.box > .portlet-body {
background-color: #fff; background-color: #444;
color:#FFF;
padding: 10px; padding: 10px;
} }
.portlet.box.portlet-fullscreen > .portlet-body { .portlet.box.portlet-fullscreen > .portlet-body {
...@@ -3864,7 +3867,8 @@ Portlets ...@@ -3864,7 +3867,8 @@ Portlets
/* Light Portlet */ /* Light Portlet */
.portlet.light { .portlet.light {
padding: 12px 20px 15px 20px; padding: 12px 20px 15px 20px;
background-color: #fff; background-color: #3a3535;
color:#FFF;
} }
.portlet.light.bordered { .portlet.light.bordered {
border: 1px solid #e1e1e1 !important; border: 1px solid #e1e1e1 !important;
...@@ -4600,7 +4604,7 @@ Responsive & Scrollable Tables ...@@ -4600,7 +4604,7 @@ Responsive & Scrollable Tables
width: 100% !important; width: 100% !important;
margin: 0 !important; margin: 0 !important;
margin-bottom: 0; margin-bottom: 0;
background-color: #fff; background-color: #202020;
} }
.table-scrollable > .table > thead > tr > th, .table-scrollable > .table > thead > tr > th,
.table-scrollable > .table > tbody > tr > th, .table-scrollable > .table > tbody > tr > th,
...@@ -4889,7 +4893,7 @@ Light Table ...@@ -4889,7 +4893,7 @@ Light Table
} }
.table.table-light.table-hover > tbody > tr > td:hover, .table.table-light.table-hover > tbody > tr > td:hover,
.table.table-light.table-hover > tbody > tr > th:hover, .table.table-light.table-hover > tbody > tr:hover > td, .table.table-light.table-hover > tbody > tr:hover > th { .table.table-light.table-hover > tbody > tr > th:hover, .table.table-light.table-hover > tbody > tr:hover > td, .table.table-light.table-hover > tbody > tr:hover > th {
background: #f9fafb; background: #404040;
} }
/*** /***
...@@ -5530,9 +5534,8 @@ AngularJS Basic Animations ...@@ -5530,9 +5534,8 @@ AngularJS Basic Animations
} }
/* Button */ /* Button */
.btn.default { .btn.default {
color: #333333; color: #EEE;
background-color: #e5e5e5; background-color: #888b8c;
border-color: "";
} }
.btn.default:hover, .btn.default:focus, .btn.default:active, .btn.default.active { .btn.default:hover, .btn.default:focus, .btn.default:active, .btn.default.active {
color: #333333; color: #333333;
......
myproject/src/main/webapp/common/metroMenu.jsp
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
To change this template use File | Settings | File Templates. To change this template use File | Settings | File Templates.
--%> --%>
<%@ page language="java" pageEncoding="UTF-8" %> <%@ page language="java" pageEncoding="UTF-8" %>
<a href="${ctx}/homeMenu.html" style="margin-left: 55px;">
<img src="${ctx}/assets/admin/layout/img/smdboxlogo1.png?id=3" alt="logo" class="logo-default" width="70px" height="70px"/>
</a>
<ul class="page-sidebar-menu" data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200"> <ul class="page-sidebar-menu" data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200">
<!-- DOC: To remove the sidebar toggler from the sidebar you just need to completely remove the below "sidebar-toggler-wrapper" LI element --> <!-- DOC: To remove the sidebar toggler from the sidebar you just need to completely remove the below "sidebar-toggler-wrapper" LI element -->
<li class="sidebar-toggler-wrapper"> <li class="sidebar-toggler-wrapper">
...@@ -71,29 +74,29 @@ ...@@ -71,29 +74,29 @@
<ul class="sub-menu"> <ul class="sub-menu">
<li> <li>
<a href="${ctx}/component/componentSearch.html?type=0"> <a href="${ctx}/component/componentSearch.html?type=0" name="component">
<fmt:message key="menu.product.component"/></a> <fmt:message key="menu.product.component"/></a>
</li> </li>
<li> <li>
<a href="${ctx}/component/componentSearch.html?type=1"> <a href="${ctx}/component/componentSearch.html?type=1" name="component">
<fmt:message key="menu.product.solder"/></a> <fmt:message key="menu.product.solder"/></a>
</li> </li>
<li> <li>
<a href="${ctx}/component/componentSearch.html?type=2"> <a href="${ctx}/component/componentSearch.html?type=2" name="component">
<fmt:message key="menu.product.pcb"/></a> <fmt:message key="menu.product.pcb"/></a>
</li> </li>
<li> <li>
<a href="${ctx}/component/componentSearch.html?type=3"> <a href="${ctx}/component/componentSearch.html?type=3" name="component">
<fmt:message key="menu.product.others"/></a> <fmt:message key="menu.product.others"/></a>
</li> </li>
<c:if test="${loginUser.debug}"> <c:if test="${loginUser.debug}">
<li> <li>
<a href="${ctx}/component/componentSearch.html?type=4"> <a href="${ctx}/component/componentSearch.html?type=4" name="component">
<fmt:message key="menu.product.fixture"/></a> <fmt:message key="menu.product.fixture"/></a>
</li> </li>
</c:if> </c:if>
...@@ -114,24 +117,16 @@ ...@@ -114,24 +117,16 @@
<span class="arrow "></span> <span class="arrow "></span>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<security:authorize ifAnyGranted="ROLE_MANAGE_FEEDER">
<li>
<a href="${ctx}/workOrder/feederSearch.html">
<fmt:message key="menu.order.management"/>
</a>
</li>
</security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT"> <security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT">
<li> <li>
<a href="${ctx}/component/storagePosFind.html" name="workOrder"> <a href="${ctx}/workOrder/liteOrderSearch.html" name="workOrder">
<fmt:message key="menu.findout"/> <fmt:message key="menu.workOrder"/>
</a> </a>
</li> </li>
<li> <li>
<a href="${ctx}/workOrder/specifiedBatchSearch.html"> <a href="${ctx}/component/storagePosFind.html" name="workOrder">
<fmt:message key="menu.inRule"/> <fmt:message key="menu.findout"/>
</a> </a>
</li> </li>
<li> <li>
...@@ -174,40 +169,6 @@ ...@@ -174,40 +169,6 @@
</security:authorize> </security:authorize>
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT">
<li id="menu-storage">
<a href="javascript:;">
<i class="icon-layers"></i>
<span class="title"><fmt:message key="menu.box"/></span>
<span class="arrow "></span>
</a>
<ul class="sub-menu">
<c:if test="${loginUser.debug}">
<li>
<a href="${ctx}/storage/storageSearch.html">
<fmt:message key="menu.box.manage"/>
</a>
</li>
</c:if>
<li>
<a href="${ctx}/storage/manualStorage.html?type=0">
<fmt:message key="menu.box.boxi"/>
</a>
</li>
<li>
<a href="${ctx}/storage/manualStorage.html?type=1">
<fmt:message key="menu.box.liteBox"/>
</a>
</li>
<li>
<a href="${ctx}/storage/virtualStorage.html">
<fmt:message key="menu.box.virtualStorage"/>
</a>
</li>
</ul>
</li>
</security:authorize>
<%--条码管理--%> <%--条码管理--%>
<security:authorize ifAnyGranted="ROLE_MANAGE_BARCODE"> <security:authorize ifAnyGranted="ROLE_MANAGE_BARCODE">
<li id="menu-barcode"> <li id="menu-barcode">
...@@ -218,15 +179,15 @@ ...@@ -218,15 +179,15 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li> <li>
<a href="${ctx}/barcode/barcodeUpdate.html"> <a href="${ctx}/barcode/barcodeUpdate.html" name="barcode">
<fmt:message key="menu.barCode.new"/></a> <fmt:message key="menu.barCode.new"/></a>
</li> </li>
<li> <li>
<a href="${ctx}/barcode/barcodeSearch.html"> <a href="${ctx}/barcode/barcodeSearch.html" name="barcode">
<fmt:message key="menu.barCode.search"/></a> <fmt:message key="menu.barCode.search"/></a>
</li> </li>
<li> <li>
<a href="${ctx}/barcode/barcodeSettings.html"> <a href="${ctx}/barcode/barcodeSettings.html" name="barcode">
<fmt:message key="menu.barCode.settings"/></a> <fmt:message key="menu.barCode.settings"/></a>
</li> </li>
</ul> </ul>
...@@ -253,10 +214,10 @@ ...@@ -253,10 +214,10 @@
<%--<fmt:message key="menu.bigdata.inOutList" /></a>--%> <%--<fmt:message key="menu.bigdata.inOutList" /></a>--%>
<%--</li>--%> <%--</li>--%>
<li> <%--<li>--%>
<a href="${ctx}/system/dataReport.html" name="data"> <%--<a href="${ctx}/system/dataReport.html" name="data">--%>
<fmt:message key="menu.bigdata.dataReport" /></a> <%--<fmt:message key="menu.bigdata.dataReport" /></a>--%>
</li> <%--</li>--%>
<li> <li>
<a href="${ctx}/dataLog/search.html" name="data"> <a href="${ctx}/dataLog/search.html" name="data">
...@@ -295,11 +256,11 @@ ...@@ -295,11 +256,11 @@
</li> </li>
</security:authorize> </security:authorize>
<%--<li>--%> <li>
<%--<a href="${ctx}/system/maintenance.html" name="system">--%> <a href="${ctx}/storage/storageSearch.html" name="system">
<%--&lt;%&ndash;<i class="icon-home"></i>&ndash;%&gt;--%> <%--<i class="icon-home"></i>--%>
<%--<fmt:message key="menu.system.maintenance"/></a>--%> <fmt:message key="menu.boxManager"/></a>
<%--</li>--%> </li>
<li> <li>
<a href="${ctx}/system/settings.html" name="system"> <a href="${ctx}/system/settings.html" name="system">
......
myproject/src/main/webapp/decorators/metroEmpty.jsp
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<link href="${ctx}/assets/global/plugins/uniform/css/uniform.default.css" rel="stylesheet" type="text/css"/> <link href="${ctx}/assets/global/plugins/uniform/css/uniform.default.css" rel="stylesheet" type="text/css"/>
<!-- END GLOBAL MANDATORY STYLES --> <!-- END GLOBAL MANDATORY STYLES -->
<!-- BEGIN PAGE LEVEL STYLES --> <!-- BEGIN PAGE LEVEL STYLES -->
<link href="${ctx}/assets/admin/pages/css/login.css" rel="stylesheet" type="text/css"/> <link href="${ctx}/assets/admin/pages/css/login.css?id=93" rel="stylesheet" type="text/css"/>
<!-- END PAGE LEVEL SCRIPTS --> <!-- END PAGE LEVEL SCRIPTS -->
<!-- BEGIN THEME STYLES --> <!-- BEGIN THEME STYLES -->
<link href="${ctx}/assets/global/css/components.css" id="style_components" rel="stylesheet" type="text/css"/> <link href="${ctx}/assets/global/css/components.css" id="style_components" rel="stylesheet" type="text/css"/>
...@@ -49,9 +49,9 @@ ...@@ -49,9 +49,9 @@
</div> </div>
<!-- BEGIN LOGO --> <!-- BEGIN LOGO -->
<div class="logo"> <div class="logo">
<a href="/"> <%--<a href="/">--%>
<img src="${ctx}/assets/admin/layout/img/smdboxlogo1.png" alt=""/> <%--<img src="${ctx}/assets/admin/layout/img/smdboxlogo1.png?id=2" alt=""/>--%>
</a> <%--</a>--%>
</div> </div>
<!-- END LOGO --> <!-- END LOGO -->
<!-- BEGIN LOGIN --> <!-- BEGIN LOGIN -->
......
myproject/src/main/webapp/login.jsp
<%@ include file="/common/taglibs.jsp" %> <%@ include file="/common/taglibs.jsp" %>
<%@ page language="java" pageEncoding="UTF-8" %>
<div class="top-menu" style="margin: 0;padding: 0;float: right">
<ul class="nav navbar-nav pull-right">
<li class="dropdown dropdown-language">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
<span class="icon-globe"></span>
<span class="langname">
</span>
<i class="fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu dropdown-menu-default">
<li>
<a href="?locale=en">
<img alt="" src="${ctx}/assets/global/img/flags/en.png"> English</a>
</li>
<li>
<a href="?locale=zh-CN">
<img alt="" src="${ctx}/assets/global/img/flags/zh-CN.png"> 中文</a>
</li>
<li>
<a href="?locale=jp">
<img alt="" src="${ctx}/assets/global/img/flags/jp.png"> 日本語</a>
</li>
</ul>
</li>
</div>
<head> <head>
<title><fmt:message key="login.title"/></title> <title><fmt:message key="login.title"/></title>
...@@ -9,7 +37,7 @@ ...@@ -9,7 +37,7 @@
<form method="post" id="loginForm" action="<c:url value='/j_security_check'/>" <form method="post" id="loginForm" action="<c:url value='/j_security_check'/>"
onsubmit="saveUsername(this);return validateForm(this)" class="form-signin" autocomplete="off"> onsubmit="saveUsername(this);return validateForm(this)" class="form-signin" autocomplete="off">
<h3 class="form-title"> <h3 class="form-title">
<fmt:message key="login.heading"/> <img src="${ctx}/assets/admin/layout/img/smdboxlogo1.png?id=2" alt=""/>
</h3> </h3>
<c:if test="${param.error != null}"> <c:if test="${param.error != null}">
<div class="alert alert-danger alert-dismissable"> <div class="alert alert-danger alert-dismissable">
...@@ -18,29 +46,29 @@ ...@@ -18,29 +46,29 @@
</c:if> </c:if>
<div class="form-group"> <div class="form-group">
<input type="text" name="j_username" id="j_username" class="form-control form-control-solid placeholder-no-fix" <input type="text" name="j_username" id="j_username" class="form-control form-control-solid placeholder-no-fix"
placeholder="<fmt:message key="label.username"/>" required tabindex="1"> placeholder="<fmt:message key="label.username"/>" required tabindex="1">
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="password" class="form-control form-control-solid placeholder-no-fix" name="j_password" id="j_password" tabindex="2" <input type="password" class="form-control form-control-solid placeholder-no-fix" name="j_password" id="j_password" tabindex="2"
placeholder="<fmt:message key="label.password"/>" required> placeholder="<fmt:message key="label.password"/>" required>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-success uppercase" name="login" tabindex="4"> <button type="submit" class="btn grey-gallery uppercase" name="login" tabindex="4" style="width: 200px;text-align: center;background-color: #04487e;">
<fmt:message key='button.login'/> <fmt:message key='button.login'/>
</button> </button>
<c:if test="${appConfig['rememberMeEnabled']}"> <%--<c:if test="${appConfig['rememberMeEnabled']}">--%>
<label for="rememberMe" class="rememberme check"> <%--<label for="rememberMe" class="rememberme check">--%>
<input type="checkbox" name="_spring_security_remember_me" id="rememberMe" tabindex="3"/> <%--<input type="checkbox" name="_spring_security_remember_me" id="rememberMe" tabindex="3"/>--%>
<fmt:message key="login.rememberMe"/></label> <%--<fmt:message key="login.rememberMe"/></label>--%>
</c:if> <%--</c:if>--%>
</div> </div>
</form> </form>
<%--<p>--%> <%--<p>--%>
<%--<fmt:message key="login.signup">--%> <%--<fmt:message key="login.signup">--%>
<%--<fmt:param><c:url value="/signup"/></fmt:param>--%> <%--<fmt:param><c:url value="/signup"/></fmt:param>--%>
<%--</fmt:message>--%> <%--</fmt:message>--%>
<%--</p>--%> <%--</p>--%>
<c:set var="scripts" scope="request"> <c:set var="scripts" scope="request">
......
myproject/storageManager.iml
...@@ -17,8 +17,20 @@ ...@@ -17,8 +17,20 @@
</sourceRoots> </sourceRoots>
</configuration> </configuration>
</facet> </facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
<deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!