Skip to content

孙克 / SmdBox

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

锡膏料仓修改

1 个父辈 c35dbca2
内嵌 并排
正在显示 9 个修改的文件 包含 71 行增加 和 11 行删除
myproject/src/main/java/com/myproject/bean/utils/StatusBean.java
......@@ -66,6 +66,11 @@ public class StatusBean {
* 英文提示消息
*/
public String msgEn = "";
/**
* 日语提示消息
*/
public String msgJp = "";
/// <summary>
/// 包含的多个 BOX 的状态信息
/// </summary>
......@@ -340,6 +345,8 @@ public class StatusBean {
if(showMsg == null){
if(Language.ENGLISH.getLabel().contains(lang)){
showMsg = msgEn;
}else if(Language.Japan.getLabel().contains(lang)){
showMsg = msgJp;
}else{
showMsg = msg;
}
......@@ -462,4 +469,12 @@ public class StatusBean {
}
return doorReelSignal;
}
public String getMsgJp() {
return msgJp;
}
public void setMsgJp(String msgJp) {
this.msgJp = msgJp;
}
}
myproject/src/main/java/com/myproject/util/BarcodeRule.java
......@@ -377,7 +377,7 @@ public class BarcodeRule {
String value = getStrValue(codeArr);
if(!Strings.isNullOrEmpty(value)){
try{
return Float.valueOf(value).intValue();
return Float.valueOf(value.trim()).intValue();
}catch (Exception ex){
log.warn(value + " is not a validate int");
}
......@@ -662,6 +662,11 @@ public class BarcodeRule {
codeStr = "=7x8=140032005 18B030918B 200.000 614A 0001045024 0001 20200414-141329";
rule = "PN BATCH QTY[-1:0:1] RI ";
codeStr = "327203324369301963";
rule = "PN[-1:0:13][RI]";
codeStr = "[)>@SIIX20@2181YYBQ00@1362-00260@5000.000 @@";
rule = "1@2@RI@PN@QTY[-1:0:5]@4@5";
BarcodeRule br = BarcodeRule.newRule(rule);
Barcode b = br.toCodeBean(codeStr).getBarcode();
if(b != null){
......
myproject/src/main/java/com/myproject/webapp/controller/FileUploadController.java
......@@ -17,6 +17,7 @@ import com.myproject.util.StorageConstants;
import com.myproject.webapp.controller.webService.DataCache;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
......@@ -369,6 +370,14 @@ public class FileUploadController extends BaseFormController {
log.info("未包含【宽度】或【w】列");
throw new ValidateException("必须包含【宽度】列");
}
int typeIndex = -1;
try{
typeIndex = csvRead.getIndex("库位类型","posType");
}catch (Exception e){
//库位类型这一列,没有也可以正常导入
}
List<StoragePosExcel> list = new ArrayList<StoragePosExcel>();
while(csvRead.readRecord()){
String[] lineValues = csvRead.getValues();
......@@ -376,6 +385,23 @@ public class FileUploadController extends BaseFormController {
String priorityStr = lineValues[priIndex];
String hStr = lineValues[hIndex];
String wStr = lineValues[wIndex];
String typeStr = "";
boolean isWarmPos = false;
if(typeIndex != -1){
typeStr = lineValues[typeIndex];
if(Strings.isNotBlank(typeStr)){
//只导入库为类型为1或2的
if(typeStr.equals("1")){//1=冷藏
isWarmPos = false;
}else if(typeStr.equals("2")){//2=回温
isWarmPos = true;
}else{
continue;
}
}
}
if(posName.isEmpty() || priorityStr.isEmpty() || hStr.isEmpty() || wStr.isEmpty()){
log.warn("行[posName="+posName + ","+"priority="+priorityStr+",h="+hStr+",w="+wStr+"]中有空白内容,此行忽略");
}else{
......@@ -384,6 +410,7 @@ public class FileUploadController extends BaseFormController {
posInfo.setPriority(Double.valueOf(priorityStr));
posInfo.setH(Integer.valueOf(hStr));
posInfo.setW(Integer.valueOf(wStr));
posInfo.setWarmPos(isWarmPos);
list.add(posInfo);
}
}
......@@ -403,6 +430,7 @@ public class FileUploadController extends BaseFormController {
storagePos.setW(storagePosExcel.getW());
storagePos.setH(storagePosExcel.getH());
storagePos.setStorageId(storage.getId());
storagePos.setWarmPos(storagePosExcel.isWarmPos());
storagePosManager.save(storagePos);
}
}
......
myproject/src/main/java/com/myproject/webapp/controller/webService/StatusController.java
......@@ -57,9 +57,11 @@ public class StatusController extends BaseController{
String msg = getText(e.getMessage(),((ValidateException) e).getParams(), request.getLocale(),e.getMessage());
statusBean.setMsg(msg);
statusBean.setMsgEn(msg);
statusBean.setMsgJp(e.getMessage());
}else{
statusBean.setMsg(e.getMessage());
statusBean.setMsgEn(e.getMessage());
statusBean.setMsgJp(e.getMessage());
}
}
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
......@@ -1257,8 +1257,9 @@ public class TaskService implements ITaskService {
if (puttingTask.isCancel()) {//被取消的任务,客户端发完成信号过来,修改取消状态为已完成
log.warn(statusBean.getCid() + "回温取料[" + boxStatus.getPosId() + "]完成时任务不存在");
}
}
rewarmPuttingEnd(puttingTask);
}
} else if (StorageConstants.BOX_STATUS.MIX_TAKING == status) {
//搅拌取料
......
myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp
......@@ -184,9 +184,9 @@
<display:column titleKey="solder.storageCondition">
${component.storageCondition}℃
</display:column>
<display:column titleKey="solder.maxStorageTime">
${component.maxStorageTime}<fmt:message key="solder.hour"/>
</display:column>
<%--<display:column titleKey="solder.maxStorageTime">--%>
<%--${component.maxStorageTime}<fmt:message key="solder.hour"/>--%>
<%--</display:column>--%>
<display:column titleKey="solder.warmTime">
${component.warmTime}<fmt:message key="solder.hour"/>
</display:column>
......@@ -194,9 +194,9 @@
${component.minStoreNum}-${component.maxStoreNum}
</display:column>
<display:column titleKey="solder.storageTime">
${component.maxStorageTime - component.warmTime}<fmt:message key="solder.hour"/>
</display:column>
<%--<display:column titleKey="solder.storageTime">--%>
<%--${component.maxStorageTime - component.warmTime}<fmt:message key="solder.hour"/>--%>
<%--</display:column>--%>
<display:column media="html" titleKey=" ">
<a onclick="window.open('${ctx}/codeGen.html?pnId=${component.id}&num=1')"><fmt:message key="component.generateBarcode"/> </a>
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
......@@ -212,7 +212,7 @@
<fmt:formatDate value="${pos.updateDate}" pattern="yyyy-MM-dd"/>
</display:column>
<display:column titleKey="component.amount">
<display:column titleKey="component.amount" sortProperty="barcode.amount" sortable="true">
<c:if test="${pos.barcode.type == 1 || pos.barcode.type == 4}">-</c:if>
<c:if test="${pos.barcode.type != 1 && pos.barcode.type != 4}">${pos.barcode.amount}</c:if>
</display:column>
......
myproject/src/main/webapp/WEB-INF/pages/storage/solderBox.jsp
......@@ -130,7 +130,7 @@
<th><fmt:message key="barcode.expireDate"/></th>
<th><fmt:message key="checkOut.pos"/></th>
<th><fmt:message key="dataLog.status"/></th>
<th><fmt:message key="solderBox.task.outTime"/></th>
<th><fmt:message key="计划时间"/></th>
</tr>
</thead>
<tbody class="dataTable">
......@@ -254,10 +254,19 @@
function clearOutDate(pid){
Lobibox.confirm({
title: "确认",
msg: "确定要清除计划吗?",
callback: function ($this, type, ev) {
if(type == 'yes'){
$.post("${ctx}/service/store/solder/clearOutDate", {pid: pid}, function (data) {
showMsg(data);
});
}
}
});
}
var solderStatusMsg={
"1":"${solder_status_1}",
"2":"${solder_status_2}",
......
myproject/src/main/webapp/decorators/metro.jsp
......@@ -241,7 +241,7 @@
<div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div>
<span class="right" style="color: #a3a3a3;">Version: 1.6.2117</span>
<span class="right" style="color: #a3a3a3;">Version: 1.8.209</span>
<div class="scroll-to-top">
<i class="icon-arrow-up"></i>
</div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!