Skip to content

孙克 / smf-core

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

启用禁用库位增加操作日志

1 个父辈 4481d33f
内嵌 并排
正在显示 10 个修改的文件 包含 45 行增加 和 2 行删除
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
...@@ -388,6 +388,7 @@ public class DeviceController { ...@@ -388,6 +388,7 @@ public class DeviceController {
storagePosManager.save(pos); storagePosManager.save(pos);
log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]"); log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
DeviceMessageUtil.addEnabledPosMessage(pos,"");
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
} }
@ApiOperation("客户端判断CID是否存在") @ApiOperation("客户端判断CID是否存在")
...@@ -422,7 +423,7 @@ public class DeviceController { ...@@ -422,7 +423,7 @@ public class DeviceController {
} }
//料仓已存在，判断料仓是否有库位 //料仓已存在，判断料仓是否有库位
List<StoragePos> storagePosList = storagePosManager.findByStorage(storage.getId()); List<StoragePos> storagePosList = storagePosManager.findByStorage(storage.getId());
if (storagePosList.size() >= 0) { if (storagePosList.size() > 0) {
return ResultBean.newErrorResult(1, "smfcore.alreadyHasPos", "料仓[{0}]已有库位数：[{1}]", new String[]{cid, storagePosList.size() + ""}); return ResultBean.newErrorResult(1, "smfcore.alreadyHasPos", "料仓[{0}]已有库位数：[{1}]", new String[]{cid, storagePosList.size() + ""});
} }
......
src/main/java/com/neotel/smfcore/core/message/rest/bean/dto/MessageDto.java
...@@ -43,4 +43,7 @@ public class MessageDto implements Serializable { ...@@ -43,4 +43,7 @@ public class MessageDto implements Serializable {
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private Date finishTime; private Date finishTime;
@ApiModelProperty(value = "操作人")
private String operator;
} }
src/main/java/com/neotel/smfcore/core/message/service/po/Message.java
...@@ -24,7 +24,7 @@ public class Message extends BasePo implements Serializable { ...@@ -24,7 +24,7 @@ public class Message extends BasePo implements Serializable {
public static Message newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){ public static Message newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){
Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null); Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null,"");
return message; return message;
} }
/** /**
...@@ -66,6 +66,11 @@ public class Message extends BasePo implements Serializable { ...@@ -66,6 +66,11 @@ public class Message extends BasePo implements Serializable {
*/ */
private Date finishTime; private Date finishTime;
/**
* 操作人
*/
private String operator;
public void addData(String key,String value){ public void addData(String key,String value){
if(dataList==null){ if(dataList==null){
dataList=new ArrayList<>(); dataList=new ArrayList<>();
......
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
...@@ -7,6 +7,7 @@ import com.neotel.smfcore.core.message.enums.MessageType; ...@@ -7,6 +7,7 @@ import com.neotel.smfcore.core.message.enums.MessageType;
import com.neotel.smfcore.core.message.service.manager.IMessageManager; import com.neotel.smfcore.core.message.service.manager.IMessageManager;
import com.neotel.smfcore.core.message.service.po.Message; import com.neotel.smfcore.core.message.service.po.Message;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -83,4 +84,24 @@ public class DeviceMessageUtil { ...@@ -83,4 +84,24 @@ public class DeviceMessageUtil {
} }
} }
public static void addEnabledPosMessage(StoragePos pos, String operator){
Storage storage = dataCache.getStorageById(pos.getStorageId());
if (storage != null) {
String posName = pos.getPosName();
Message message;
if (pos.isEnabled()) {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}",
new String[]{posName});
} else {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}",
new String[]{posName});
}
message.setOperator(operator);
message.addData("posName", posName);
message.addData("enabled", pos.isEnabled() + "");
messageManager.save(message);
}
}
} }
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.barcode.service.po.Barcode; ...@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.barcode.utils.CodeResolve; import com.neotel.smfcore.core.barcode.utils.CodeResolve;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.language.util.MessageUtils; import com.neotel.smfcore.core.language.util.MessageUtils;
import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto; import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto; import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
import com.neotel.smfcore.core.storage.rest.dto.StoragePosEnabledDto; import com.neotel.smfcore.core.storage.rest.dto.StoragePosEnabledDto;
...@@ -215,6 +216,7 @@ public class StoragePosController { ...@@ -215,6 +216,7 @@ public class StoragePosController {
pos.setEnabled(enabledDto.isEnabled()); pos.setEnabled(enabledDto.isEnabled());
storagePosManager.save(pos); storagePosManager.save(pos);
log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled()); log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled());
DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
} }
...@@ -243,6 +245,7 @@ public class StoragePosController { ...@@ -243,6 +245,7 @@ public class StoragePosController {
if(pos.isEnabled()!= saveDto.isEnabled()){ if(pos.isEnabled()!= saveDto.isEnabled()){
pos.setEnabled(saveDto.isEnabled()); pos.setEnabled(saveDto.isEnabled());
enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位"; enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位";
DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
} }
storagePosManager.save(pos); storagePosManager.save(pos);
log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"+enabledStr); log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"+enabledStr);
......
src/main/resources/messages.properties
...@@ -234,6 +234,8 @@ smfcore.noAccess =\u6682\u65E0\u6743\u9650 ...@@ -234,6 +234,8 @@ smfcore.noAccess =\u6682\u65E0\u6743\u9650
smfcore.toDebugModel.ok=\u5DF2\u8FDB\u5165\u8C03\u8BD5\u6A21\u5F0F smfcore.toDebugModel.ok=\u5DF2\u8FDB\u5165\u8C03\u8BD5\u6A21\u5F0F
smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8C03\u8BD5\u6A21\u5F0F smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8C03\u8BD5\u6A21\u5F0F
smfcore.pwd.error=\u5BC6\u7801\u9519\u8BEF smfcore.pwd.error=\u5BC6\u7801\u9519\u8BEF
smfcore.messages.enabledPos=\u542F\u7528\u5E93\u4F4D\uFF1A{0}
smfcore.messages.disabledPos=\u7981\u7528\u5E93\u4F4D\uFF1A{0}
#smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0} #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
#smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1} #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
......
src/main/resources/messages_en_US.properties
...@@ -234,4 +234,6 @@ smfcore.noAccess =No permission ...@@ -234,4 +234,6 @@ smfcore.noAccess =No permission
smfcore.toDebugModel.ok=Already in debug mode smfcore.toDebugModel.ok=Already in debug mode
smfcore.exitDebugModel.ok=Exited debug mode smfcore.exitDebugModel.ok=Exited debug mode
smfcore.pwd.error=Password error smfcore.pwd.error=Password error
smfcore.messages.enabledPos=Enable Location\uFF1A{0}
smfcore.messages.disabledPos=Disable Location\uFF1A{0}
src/main/resources/messages_ja_JP.properties
...@@ -234,4 +234,6 @@ smfcore.noAccess =\u73FE\u6642\u70B9\u3067\u306F\u8A31\u53EF\u3057\u3066\u3044\u ...@@ -234,4 +234,6 @@ smfcore.noAccess =\u73FE\u6642\u70B9\u3067\u306F\u8A31\u53EF\u3057\u3066\u3044\u
smfcore.toDebugModel.ok=\u30B3\u30DF\u30C3\u30B7\u30E7\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9\u306B\u79FB\u884C\u3057\u307E\u3057\u305F smfcore.toDebugModel.ok=\u30B3\u30DF\u30C3\u30B7\u30E7\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9\u306B\u79FB\u884C\u3057\u307E\u3057\u305F
smfcore.exitDebugModel.ok=\u30C7\u30D0\u30C3\u30B0\u30E2\u30FC\u30C9\u306E\u7D42\u4E86 smfcore.exitDebugModel.ok=\u30C7\u30D0\u30C3\u30B0\u30E2\u30FC\u30C9\u306E\u7D42\u4E86
smfcore.pwd.error=\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC smfcore.pwd.error=\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC
smfcore.messages.enabledPos=\u6709\u52B9\u306B\u3059\u308B\u30B9\u30C8\u30EC\u30FC\u30B8\u4F4D\u7F6E \uFF1A{0}
smfcore.messages.disabledPos=\u7121\u52B9\u5316\u30B9\u30C8\u30EC\u30FC\u30B8\u4F4D\u7F6E\uFF1A{0}
src/main/resources/messages_zh_CN.properties
...@@ -234,3 +234,5 @@ smfcore.noAccess =\u6682\u65E0\u6743\u9650 ...@@ -234,3 +234,5 @@ smfcore.noAccess =\u6682\u65E0\u6743\u9650
smfcore.toDebugModel.ok=\u5DF2\u8FDB\u5165\u8C03\u8BD5\u6A21\u5F0F smfcore.toDebugModel.ok=\u5DF2\u8FDB\u5165\u8C03\u8BD5\u6A21\u5F0F
smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8C03\u8BD5\u6A21\u5F0F smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8C03\u8BD5\u6A21\u5F0F
smfcore.pwd.error=\u5BC6\u7801\u9519\u8BEF smfcore.pwd.error=\u5BC6\u7801\u9519\u8BEF
smfcore.messages.enabledPos=\u542F\u7528\u5E93\u4F4D\uFF1A{0}
smfcore.messages.disabledPos=\u7981\u7528\u5E93\u4F4D\uFF1A{0}
src/main/resources/messages_zh_TW.properties
...@@ -234,3 +234,5 @@ smfcore.noAccess =\u66AB\u7121\u6B0A\u9650 ...@@ -234,3 +234,5 @@ smfcore.noAccess =\u66AB\u7121\u6B0A\u9650
smfcore.toDebugModel.ok=\u5DF2\u9032\u5165\u8ABF\u8A66\u6A21\u5F0F smfcore.toDebugModel.ok=\u5DF2\u9032\u5165\u8ABF\u8A66\u6A21\u5F0F
smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8ABF\u8A66\u6A21\u5F0F smfcore.exitDebugModel.ok=\u5DF2\u9000\u51FA\u8ABF\u8A66\u6A21\u5F0F
smfcore.pwd.error=\u5BC6\u78BC\u932F\u8AA4 smfcore.pwd.error=\u5BC6\u78BC\u932F\u8AA4
smfcore.messages.enabledPos=\u555F\u7528\u5EAB\u4F4D\uFF1A{0}
smfcore.messages.disabledPos=\u7981\u7528\u5EAB\u4F4D\uFF1A{0}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!