Skip to content

孙克 / smf-core

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

锡膏料仓增加配置：回温完成后自动开始搅拌。

1 个父辈 e28b51ff
内嵌 并排
正在显示 11 个修改的文件 包含 48 行增加 和 1 行删除
src/main/java/com/neotel/smfcore/common/init/MenuInit.java
...@@ -121,7 +121,7 @@ public class MenuInit { ...@@ -121,7 +121,7 @@ public class MenuInit {
//addDefaultFunctionMenu(-1,null,"Neo Ai","neoai","neoai/index","neoai"); //addDefaultFunctionMenu(-1,null,"Neo Ai","neoai","neoai/index","neoai");
//Mimo看板 //Mimo看板
//addDefaultFunctionMenu(0,null,"SMD BOX MIMO","SMDBOXMIMO", "smdBoxMimo/index","smdMimo"); addDefaultFunctionMenu(0,null,"SMD BOX MIMO","SMDBOXMIMO", "smdBoxMimo/index","smdMimo");
Menu boardMap = Menu.CreatePMenu("仪表盘", 0, "dashBoard", "kanban", null); Menu boardMap = Menu.CreatePMenu("仪表盘", 0, "dashBoard", "kanban", null);
......
src/main/java/com/neotel/smfcore/common/utils/Constants.java
...@@ -169,6 +169,12 @@ public class Constants { ...@@ -169,6 +169,12 @@ public class Constants {
public static final String CACHE_spSettings="spSettings"; public static final String CACHE_spSettings="spSettings";
/** /**
*锡膏料仓回温完成后自动搅拌，默认=false,需要手动点按钮开始搅拌。true=自动开始搅拌
*/
public static final String CACHE_SP_AUTO_START_MIXED="CACHE_SP_AUTO_START_MIXED";
/**
* 缺料不自动关闭工单 * 缺料不自动关闭工单
*/ */
public static final String CACHE_closeWorkOrder = "CACHE_closeWorkOrder"; public static final String CACHE_closeWorkOrder = "CACHE_closeWorkOrder";
......
src/main/java/com/neotel/smfcore/core/equipment/enums/EquipmentType.java
...@@ -75,4 +75,8 @@ public enum EquipmentType { ...@@ -75,4 +75,8 @@ public enum EquipmentType {
return Lists.newArrayList(T_SOLUTION.name(),PANACIMNEOLINK.name(),NEXIM.name()); return Lists.newArrayList(T_SOLUTION.name(),PANACIMNEOLINK.name(),NEXIM.name());
} }
public static List<String> nsList(){
return Lists.newArrayList(NS100.name(),NS200.name());
}
} }
src/main/java/com/neotel/smfcore/core/solder/rest/SpSolderController.java
...@@ -136,6 +136,11 @@ public class SpSolderController { ...@@ -136,6 +136,11 @@ public class SpSolderController {
SpSettingsDto dto = mapper.toDto(spSettings); SpSettingsDto dto = mapper.toDto(spSettings);
dto.setMinTemperature(msdSettiings.getMinTemperature()); dto.setMinTemperature(msdSettiings.getMinTemperature());
dto.setMaxTemperature(msdSettiings.getMaxTemperature()); dto.setMaxTemperature(msdSettiings.getMaxTemperature());
Boolean autoStartMixed=dataCache.getCache(Constants.CACHE_SP_AUTO_START_MIXED);
if(autoStartMixed==null){
autoStartMixed=false;
}
dto.setAutoStartMixed(autoStartMixed);
return dto; return dto;
} }
...@@ -161,6 +166,10 @@ public class SpSolderController { ...@@ -161,6 +166,10 @@ public class SpSolderController {
msdSettiings.setMaxTemperature(dto.getMaxTemperature()); msdSettiings.setMaxTemperature(dto.getMaxTemperature());
dataCache.updateCache(Constants.CACHE_msdSetting, msdSettiings); dataCache.updateCache(Constants.CACHE_msdSetting, msdSettiings);
log.info("更改MSD：CACHE_msdSetting=" + msdSettiings.toString()); log.info("更改MSD：CACHE_msdSetting=" + msdSettiings.toString());
dataCache.updateCache(Constants.CACHE_SP_AUTO_START_MIXED,dto.isAutoStartMixed());
log.info("更改锡膏料仓 CACHE_SP_AUTO_START_MIXED="+dto.isAutoStartMixed());
return ResultBean.newOkResult("保存成功"); return ResultBean.newOkResult("保存成功");
} }
......
src/main/java/com/neotel/smfcore/core/solder/rest/bean/dto/SpSettingsDto.java
...@@ -24,4 +24,7 @@ public class SpSettingsDto { ...@@ -24,4 +24,7 @@ public class SpSettingsDto {
@ApiModelProperty("最高温度") @ApiModelProperty("最高温度")
private float maxTemperature = 38.0F; private float maxTemperature = 38.0F;
@ApiModelProperty("回温完成自动开始搅拌")
private boolean autoStartMixed=false;
} }
src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java
...@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.solder.util; ...@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.solder.util;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.Constants;
import com.neotel.smfcore.core.barcode.enums.SOLDER_STATUS; import com.neotel.smfcore.core.barcode.enums.SOLDER_STATUS;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
...@@ -141,10 +142,24 @@ public class SolderBoxCache { ...@@ -141,10 +142,24 @@ public class SolderBoxCache {
log.info(barcode.getBarcode() + "到达回温时间,搅拌时间为0,修改状态为待出库"); log.info(barcode.getBarcode() + "到达回温时间,搅拌时间为0,修改状态为待出库");
barcode.setSolderStatus(SOLDER_STATUS.TO_BE_OUT.name()); barcode.setSolderStatus(SOLDER_STATUS.TO_BE_OUT.name());
}else{ }else{
//判断是否自动开始搅拌
Boolean autoStartMixed=dataCache.getCache(Constants.CACHE_SP_AUTO_START_MIXED);
if(autoStartMixed==null){
autoStartMixed=false;
}
if(autoStartMixed){
log.info(barcode.getBarcode() + "到达回温时间,已配置CACHE_SP_AUTO_START_MIXED=true,自动开始搅拌，修改状态=TO_BE_MIXED");
barcode.setSolderStatus(SOLDER_STATUS.TO_BE_MIXED.name());
}else{
log.info(barcode.getBarcode() + "到达回温时间,修改状态为等待搅拌，待手动开始搅拌后再开始搅拌"); log.info(barcode.getBarcode() + "到达回温时间,修改状态为等待搅拌，待手动开始搅拌后再开始搅拌");
barcode.setSolderStatus(SOLDER_STATUS.WAIT_MIXED.name()); barcode.setSolderStatus(SOLDER_STATUS.WAIT_MIXED.name());
} }
}
barcode = barcodeManager.save(barcode); barcode = barcodeManager.save(barcode);
storagePos.setBarcode(barcode); storagePos.setBarcode(barcode);
storagePosManager.save(storagePos); storagePosManager.save(storagePos);
......
src/main/resources/messages.properties
...@@ -413,3 +413,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F ...@@ -413,3 +413,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F
smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
smfcore.equipApiMsg.updateTime=\u65F6\u95F4 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -404,3 +404,5 @@ smfcore.equipApiMsg.request=Parameter ...@@ -404,3 +404,5 @@ smfcore.equipApiMsg.request=Parameter
smfcore.equipApiMsg.response=Result/Details smfcore.equipApiMsg.response=Result/Details
smfcore.equipApiMsg.updateTime=Time smfcore.equipApiMsg.updateTime=Time
smfcore.equipApiMsg.state=Type smfcore.equipApiMsg.state=Type
smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u30EA\u30AF\u30A8\u30B9\u30C8\u60C5\u5831 ...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u30EA\u30AF\u30A8\u30B9\u30C8\u60C5\u5831
smfcore.equipApiMsg.response=\u30EC\u30B9\u30DD\u30F3\u30B9\u60C5\u5831 smfcore.equipApiMsg.response=\u30EC\u30B9\u30DD\u30F3\u30B9\u60C5\u5831
smfcore.equipApiMsg.updateTime=\u6642\u9593 smfcore.equipApiMsg.updateTime=\u6642\u9593
smfcore.equipApiMsg.state=\u30B9\u30C6\u30FC\u30BF\u30B9 smfcore.equipApiMsg.state=\u30B9\u30C6\u30FC\u30BF\u30B9
smfcore.equipment.view.nsgroup=\u30CD\u30AA\u30B9\u30AD\u30E3\u30F3
smfcore.equipment.view.apigroup=\u30D4\u30C3\u30AF\u30A2\u30F3\u30C9\u30D7\u30EC\u30FC\u30B9\u30DE\u30B7\u30F3
src/main/resources/messages_zh_CN.properties
...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F ...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F
smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
smfcore.equipApiMsg.updateTime=\u65F6\u95F4 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F ...@@ -400,3 +400,5 @@ smfcore.equipApiMsg.request=\u8BF7\u6C42\u4FE1\u606F
smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
smfcore.equipApiMsg.updateTime=\u65F6\u95F4 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!