Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6edabd18 由 LN
选项

锡膏料仓导出温湿度修改

1 个父辈 b134f35f
内嵌 并排
正在显示 6 个修改的文件 包含 32 行增加 和 1 行删除
src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java
...@@ -139,7 +139,11 @@ public class HumitureController { ...@@ -139,7 +139,11 @@ public class HumitureController {
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.cid", locale, "CID"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.cid", locale, "CID")));
if (isSpStorage) { if (isSpStorage) {
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.ntemperature", locale, "冷藏温度"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.ntemperature", locale, "冷藏温度")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.ntemperature2", locale, "冷藏温度2")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.ntemperature3", locale, "冷藏温度3")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.codetemperature", locale, "制冷温度"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.codetemperature", locale, "制冷温度")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.codetemperature2", locale, "制冷温度2")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.wtemperature", locale, "回温温度")));
}else{ }else{
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.temperature", locale, "温度"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.temperature", locale, "温度")));
} }
...@@ -147,6 +151,7 @@ public class HumitureController { ...@@ -147,6 +151,7 @@ public class HumitureController {
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.createDate", locale, "时间"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.createDate", locale, "时间")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.updateDate", locale, "更新时间"))); // header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.updateDate", locale, "更新时间")));
return header; return header;
} }
...@@ -164,12 +169,18 @@ public class HumitureController { ...@@ -164,12 +169,18 @@ public class HumitureController {
data.add(humiture.getCid()); data.add(humiture.getCid());
data.add(humiture.getTemperature()); data.add(humiture.getTemperature());
if (isSpStorage) { if (isSpStorage) {
data.add(humiture.getTemperature2());
data.add(humiture.getTemperature3());
data.add(humiture.getCodeAirTemp()); data.add(humiture.getCodeAirTemp());
data.add(humiture.getCodeAirTemp2() );
data.add(humiture.getWTemp());
} }
data.add(humiture.getHumidity()); data.add(humiture.getHumidity());
data.add(createDate); data.add(createDate);
// data.add(updateDate); // data.add(updateDate);
dataList.add(data); dataList.add(data);
} }
return dataList; return dataList;
} }
......
src/main/resources/messages.properties
...@@ -403,3 +403,7 @@ smfcore.storagePos.no=\u5426 ...@@ -403,3 +403,7 @@ smfcore.storagePos.no=\u5426
smfcore.dashBoard=\u4EEA\u8868\u76D8 smfcore.dashBoard=\u4EEA\u8868\u76D8
smfcore.spHumiture=\u6E29\u6E7F\u5EA6 smfcore.spHumiture=\u6E29\u6E7F\u5EA6
smfcore.storageOther=\u5176\u4ED6\u8BBE\u5907 smfcore.storageOther=\u5176\u4ED6\u8BBE\u5907
smfcore.humiture.ntemperature2=\u51B7\u85CF\u6E29\u5EA62
smfcore.humiture.ntemperature3=\u51B7\u85CF\u6E29\u5EA63
smfcore.humiture.codetemperature2=\u5236\u51B7\u6E29\u5EA62
smfcore.humiture.wtemperature=\u56DE\u6E29\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -362,7 +362,7 @@ smfcore.storagePos.weight=Weight ...@@ -362,7 +362,7 @@ smfcore.storagePos.weight=Weight
smfcore.expireSolderPaste=Expired Solder Paste smfcore.expireSolderPaste=Expired Solder Paste
smfcore.spbox.backFail=Back to the library verification failure smfcore.spbox.backFail=Back to the library verification failure
smfcore.spbox.expireOut=Expired solder paste out of storage smfcore.spbox.expireOut=Expired solder paste out of storage
smfcore.humiture.codetemperature=Refrigeration zone temperature smfcore.humiture.codetemperature=Cooling Temperature
smfcore.humiture.ntemperature=Return temperature zone temperature smfcore.humiture.ntemperature=Return temperature zone temperature
smfcore.cyclecount.executing=Cycle Count are being executed smfcore.cyclecount.executing=Cycle Count are being executed
smfcore.eleckanban=Dashboard2 smfcore.eleckanban=Dashboard2
...@@ -394,3 +394,7 @@ smfcore.storagePos.no=No ...@@ -394,3 +394,7 @@ smfcore.storagePos.no=No
smfcore.dashBoard=Dashboard smfcore.dashBoard=Dashboard
smfcore.spHumiture=Temperature & Humidity smfcore.spHumiture=Temperature & Humidity
smfcore.storageOther = Other Devices smfcore.storageOther = Other Devices
smfcore.humiture.ntemperature2=Refrigeration zone temperature 2
smfcore.humiture.ntemperature3=Refrigeration zone temperature 3
smfcore.humiture.codetemperature2=Cooling Temperature 2
smfcore.humiture.wtemperature=Return temperature zone temperature
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426 ...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426
smfcore.dashBoard=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9 smfcore.dashBoard=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
smfcore.spHumiture=\u6E29\u6E7F\u5EA6 smfcore.spHumiture=\u6E29\u6E7F\u5EA6
smfcore.storageOther = \u305D\u306E\u4ED6\u6A5F\u5668 smfcore.storageOther = \u305D\u306E\u4ED6\u6A5F\u5668
smfcore.humiture.ntemperature2=\u51B7\u85CF\u6E29\u5EA62
smfcore.humiture.ntemperature3=\u51B7\u85CF\u6E29\u5EA63
smfcore.humiture.codetemperature2=\u5236\u51B7\u6E29\u5EA62
smfcore.humiture.wtemperature=\u56DE\u6E29\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_CN.properties
...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426 ...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426
smfcore.dashBoard=\u4EEA\u8868\u76D8 smfcore.dashBoard=\u4EEA\u8868\u76D8
smfcore.spHumiture=\u6E29\u6E7F\u5EA6 smfcore.spHumiture=\u6E29\u6E7F\u5EA6
smfcore.storageOther=\u5176\u4ED6\u8BBE\u5907 smfcore.storageOther=\u5176\u4ED6\u8BBE\u5907
smfcore.humiture.ntemperature2=\u51B7\u85CF\u6E29\u5EA62
smfcore.humiture.ntemperature3=\u51B7\u85CF\u6E29\u5EA63
smfcore.humiture.codetemperature2=\u5236\u51B7\u6E29\u5EA62
smfcore.humiture.wtemperature=\u56DE\u6E29\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426 ...@@ -390,3 +390,7 @@ smfcore.storagePos.no=\u5426
smfcore.dashBoard=SP\u5100\u9336\u76E4 smfcore.dashBoard=SP\u5100\u9336\u76E4
smfcore.spHumiture=\u6E29\u6E7F\u5EA6 smfcore.spHumiture=\u6E29\u6E7F\u5EA6
smfcore.storageOther=\u5176\u4ED6\u8A2D\u5099 smfcore.storageOther=\u5176\u4ED6\u8A2D\u5099
smfcore.humiture.ntemperature2=\u51B7\u85CF\u6E29\u5EA62
smfcore.humiture.ntemperature3=\u51B7\u85CF\u6E29\u5EA63
smfcore.humiture.codetemperature2=\u5236\u51B7\u6E29\u5EA62
smfcore.humiture.wtemperature=\u56DE\u6E29\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!