Skip to content

孙克 / smf-core

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

增加锡膏料仓温湿度报表

1 个父辈 c765886b
内嵌 并排
正在显示 7 个修改的文件 包含 47 行增加 和 11 行删除
src/main/java/com/neotel/smfcore/common/init/MenuInit.java
...@@ -182,6 +182,7 @@ public class MenuInit { ...@@ -182,6 +182,7 @@ public class MenuInit {
addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutDataCount", "neolight/inOutDataCount/index", "outPut"); addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutDataCount", "neolight/inOutDataCount/index", "outPut");
addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory"); addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory");
addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture"); addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture");
addDefaultFunctionMenu(73, pMenuReport,"温湿度", "spHumiture", "humiture/spHumitureReport/index", "humiture");
//可观测性：物料追踪 //可观测性：物料追踪
Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", "scanKey",null); Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", "scanKey",null);
......
src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java
...@@ -10,6 +10,7 @@ import com.neotel.smfcore.core.humiture.rest.bean.query.HumitureQueryCriteria; ...@@ -10,6 +10,7 @@ import com.neotel.smfcore.core.humiture.rest.bean.query.HumitureQueryCriteria;
import com.neotel.smfcore.core.language.util.MessageUtils; import com.neotel.smfcore.core.language.util.MessageUtils;
import com.neotel.smfcore.core.msd.bean.MSDSettiings; import com.neotel.smfcore.core.msd.bean.MSDSettiings;
import com.neotel.smfcore.core.solder.bean.SpSettings; import com.neotel.smfcore.core.solder.bean.SpSettings;
import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.system.service.manager.IHumitureManager; import com.neotel.smfcore.core.system.service.manager.IHumitureManager;
import com.neotel.smfcore.core.system.service.po.Humiture; import com.neotel.smfcore.core.system.service.po.Humiture;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -44,22 +45,22 @@ public class HumitureController { ...@@ -44,22 +45,22 @@ public class HumitureController {
@GetMapping("api/humiture/list") @GetMapping("api/humiture/list")
public HumitureDto info(HumitureQueryCriteria criteria, Pageable pageable) { public HumitureDto info(HumitureQueryCriteria criteria, Pageable pageable) {
MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting); MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting);
if (msdSettiings == null){ if (msdSettiings == null) {
msdSettiings = new MSDSettiings(); msdSettiings = new MSDSettiings();
} }
Float maxTemperature = msdSettiings.getMaxTemperature(); Float maxTemperature = msdSettiings.getMaxTemperature();
Float maxHumidity = msdSettiings.getMaxHumidity(); Float maxHumidity = msdSettiings.getMaxHumidity();
Float minTemperature=msdSettiings.getMinTemperature(); Float minTemperature = msdSettiings.getMinTemperature();
Float minHumidity=msdSettiings.getMinHumidity(); Float minHumidity = msdSettiings.getMinHumidity();
List<String> cids = criteria.getCids(); List<String> cids = criteria.getCids();
if (cids == null || cids.isEmpty()){ if (cids == null || cids.isEmpty()) {
criteria.setCids(SecurityUtils.getUserGroupCid()); criteria.setCids(SecurityUtils.getUserGroupCid());
} }
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
query.with(Sort.by(Sort.Direction.ASC, "createDate")); query.with(Sort.by(Sort.Direction.ASC, "createDate"));
query.addCriteria(Criteria.where("temperature").ne("0")); query.addCriteria(Criteria.where("temperature").ne("0"));
PageData<Humiture> humitureList = humitureManager.findByPage(query,pageable); PageData<Humiture> humitureList = humitureManager.findByPage(query, pageable);
HumitureDto restultDto = new HumitureDto(); HumitureDto restultDto = new HumitureDto();
restultDto.setMaxHumidity(maxHumidity); restultDto.setMaxHumidity(maxHumidity);
restultDto.setMinHumidity(minHumidity); restultDto.setMinHumidity(minHumidity);
...@@ -69,7 +70,7 @@ public class HumitureController { ...@@ -69,7 +70,7 @@ public class HumitureController {
//获取锡膏料仓冷藏区温度设置 //获取锡膏料仓冷藏区温度设置
SpSettings spSettings = dataCache.getCache(Constants.CACHE_spSettings); SpSettings spSettings = dataCache.getCache(Constants.CACHE_spSettings);
if(spSettings==null) { if (spSettings == null) {
spSettings = new SpSettings(); spSettings = new SpSettings();
} }
restultDto.setMinColdAreaTemp(spSettings.getMinColdAreaTemp()); restultDto.setMinColdAreaTemp(spSettings.getMinColdAreaTemp());
...@@ -77,6 +78,7 @@ public class HumitureController { ...@@ -77,6 +78,7 @@ public class HumitureController {
return restultDto; return restultDto;
} }
public static boolean isSpStorage = false;
@ApiOperation("导出温湿度列表") @ApiOperation("导出温湿度列表")
@GetMapping(value = "api/humiture/list/download") @GetMapping(value = "api/humiture/list/download")
...@@ -88,22 +90,42 @@ public class HumitureController { ...@@ -88,22 +90,42 @@ public class HumitureController {
Float maxTemperature = msdSettiings.getMaxTemperature(); Float maxTemperature = msdSettiings.getMaxTemperature();
Float maxHumidity = msdSettiings.getMaxHumidity(); Float maxHumidity = msdSettiings.getMaxHumidity();
List<String> cids = criteria.getCids(); List<String> cids = criteria.getCids();
if (cids == null || cids.isEmpty()){ if (cids == null || cids.isEmpty()) {
criteria.setCids(SecurityUtils.getUserGroupCid()); criteria.setCids(SecurityUtils.getUserGroupCid());
} }
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
query.with(Sort.by(Sort.Direction.ASC, "createDate")); query.with(Sort.by(Sort.Direction.ASC, "createDate"));
query.addCriteria(Criteria.where("temperature").ne("0")); query.addCriteria(Criteria.where("temperature").ne("0"));
//如果有一个锡膏料仓，就添加冷藏区
Map<String, Storage> allStorages = dataCache.getAllStorage();
boolean isSp = false;
for (Storage s :
allStorages.values()) {
if (s.isSolderPaste()) {
isSp = true;
}
}
isSpStorage = isSp;
FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() { FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() {
@Override @Override
public List<List<String>> getHeader() { public List<List<String>> getHeader() {
List<List<String>> header = new ArrayList<>(); List<List<String>> header = new ArrayList<>();
Locale locale = request.getLocale(); Locale locale = request.getLocale();
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.cid", locale, "CID"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.cid", locale, "CID")));
if (isSpStorage) {
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.ntemperature", locale, "回温区温度")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.codetemperature", locale, "冷藏区温度")));
}else{
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.temperature", locale, "温度"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.temperature", locale, "温度")));
}
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.humiture", locale, "湿度"))); header.add(Lists.newArrayList(MessageUtils.getText("smfcore.humiture.humiture", locale, "湿度")));
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;
} }
...@@ -121,9 +143,12 @@ public class HumitureController { ...@@ -121,9 +143,12 @@ public class HumitureController {
List<Object> data = new ArrayList<>(); List<Object> data = new ArrayList<>();
data.add(humiture.getCid()); data.add(humiture.getCid());
data.add(humiture.getTemperature()); data.add(humiture.getTemperature());
if (isSpStorage) {
data.add(humiture.getCodeAirTemp());
}
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
...@@ -309,7 +309,7 @@ smfcore.storagePos.batch=\u6279\u6B21 ...@@ -309,7 +309,7 @@ smfcore.storagePos.batch=\u6279\u6B21
smfcore.humiture.cid=CID smfcore.humiture.cid=CID
smfcore.humiture.temperature=\u6E29\u5EA6 smfcore.humiture.temperature=\u6E29\u5EA6
smfcore.humiture.humiture=\u6E7F\u5EA6 smfcore.humiture.humiture=\u6E7F\u5EA6
smfcore.humiture.createDate=\u521B\u5EFA\u65F6\u95F4 smfcore.humiture.createDate=\u65F6\u95F4
smfcore.humiture.updateDate=\u66F4\u65B0\u65F6\u95F4 smfcore.humiture.updateDate=\u66F4\u65B0\u65F6\u95F4
smfcore.order.ri=RI smfcore.order.ri=RI
smfcore.order.pn=PN smfcore.order.pn=PN
...@@ -370,3 +370,5 @@ smfcore.storagePos.weight=\u91CD\u91CF ...@@ -370,3 +370,5 @@ smfcore.storagePos.weight=\u91CD\u91CF
smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F
smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25 smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25
smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93 smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93
smfcore.humiture.codetemperature=\u51B7\u85CF\u533A\u6E29\u5EA6
smfcore.humiture.ntemperature=\u56DE\u6E29\u533A\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -359,3 +359,5 @@ smfcore.storagePos.weight=Weight ...@@ -359,3 +359,5 @@ 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.ntemperature=Return temperature zone temperature
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -356,3 +356,5 @@ smfcore.storagePos.weight=\u91CD\u91CF ...@@ -356,3 +356,5 @@ smfcore.storagePos.weight=\u91CD\u91CF
smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F
smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25 smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25
smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93 smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93
smfcore.humiture.codetemperature=\u51B7\u85CF\u533A\u6E29\u5EA6
smfcore.humiture.ntemperature=\u56DE\u6E29\u533A\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_CN.properties
...@@ -356,3 +356,5 @@ smfcore.storagePos.weight=\u91CD\u91CF ...@@ -356,3 +356,5 @@ smfcore.storagePos.weight=\u91CD\u91CF
smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F
smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25 smfcore.spbox.backFail=\u56DE\u5E93\u9A8C\u8BC1\u5931\u8D25
smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93 smfcore.spbox.expireOut=\u8FC7\u671F\u7269\u6599\u51FA\u5E93
smfcore.humiture.codetemperature=\u51B7\u85CF\u533A\u6E29\u5EA6
smfcore.humiture.ntemperature=\u56DE\u6E29\u533A\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -357,3 +357,5 @@ smfcore.storagePos.weight=\u91CD\u91CF ...@@ -357,3 +357,5 @@ smfcore.storagePos.weight=\u91CD\u91CF
smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F smfcore.expireSolderPaste=\u8FC7\u671F\u9521\u818F
smfcore.spbox.backFail=\u56DE\u5EAB\u9A57\u8B49\u5931\u6557 smfcore.spbox.backFail=\u56DE\u5EAB\u9A57\u8B49\u5931\u6557
smfcore.spbox.expireOut=\u904E\u671F\u7269\u6599\u51FA\u5EAB smfcore.spbox.expireOut=\u904E\u671F\u7269\u6599\u51FA\u5EAB
smfcore.humiture.codetemperature=\u51B7\u85CF\u533A\u6E29\u5EA6
smfcore.humiture.ntemperature=\u56DE\u6E29\u533A\u6E29\u5EA6
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!