Skip to content

孙克 / smf-core

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

1.PO NUM解析问题 

2.物料日志导出 新增的参数
3.账户未激活限制去掉
1 个父辈 d49cc5b4
内嵌 并排
正在显示 3 个修改的文件 包含 17 行增加 和 2 行删除
src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java
...@@ -5,6 +5,7 @@ import com.google.common.base.Strings; ...@@ -5,6 +5,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.DateUtil; import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.bean.BarcodeRule; import com.neotel.smfcore.core.barcode.bean.BarcodeRule;
import com.neotel.smfcore.core.barcode.bean.CodeBean; import com.neotel.smfcore.core.barcode.bean.CodeBean;
import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE; import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
...@@ -242,6 +243,12 @@ public class CodeResolve { ...@@ -242,6 +243,12 @@ public class CodeResolve {
needUpdate = true; needUpdate = true;
} }
if (StringUtils.isNotEmpty(barcodeFromRule.getMemo())){
barcode.setMemo(barcodeFromRule.getMemo());
log.info("重新设置"+codeBeanFromRule.getCodeStr()+"的Memo:"+barcodeFromRule.getMemo());
needUpdate = true;
}
if(needUpdate){ if(needUpdate){
try { try {
barcodeManager.save(barcode); barcodeManager.save(barcode);
......
src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java
...@@ -124,7 +124,11 @@ public class TaskController { ...@@ -124,7 +124,11 @@ public class TaskController {
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.partNumber",locale,"料件编号"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.partNumber",locale,"料件编号")));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.posName",locale,"料仓名称"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.posName",locale,"料仓名称")));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.amount",locale,"数量"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.amount",locale,"数量")));
header.add(Lists.newArrayList("Mfg.date"));
header.add(Lists.newArrayList("Lot No"));
header.add(Lists.newArrayList("PO Num"));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.type",locale,"类型"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.type",locale,"类型")));
header.add(Lists.newArrayList("Total"));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.orderSource",locale,"来源"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.orderSource",locale,"来源")));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.status",locale,"状态"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.status",locale,"状态")));
header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.operator",locale,"操作人"))); header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.NeoLight.operator",locale,"操作人")));
...@@ -149,9 +153,13 @@ public class TaskController { ...@@ -149,9 +153,13 @@ public class TaskController {
data.add(dataLog.getPartNumber()); data.add(dataLog.getPartNumber());
data.add(dataLog.getPosName() + " " + dataLog.getStorageName()); data.add(dataLog.getPosName() + " " + dataLog.getStorageName());
data.add(dataLog.getNum()); data.add(dataLog.getNum());
data.add(dataLog.getProduceDate());
data.add(dataLog.getLotNo());
data.add(dataLog.getPoNum());
String typeKey = "NeoLight.logType." + dataLog.getType(); String typeKey = "NeoLight.logType." + dataLog.getType();
String typeMsg = MessageUtils.getSmfClientMsg(typeKey,locale,typeKey); String typeMsg = MessageUtils.getSmfClientMsg(typeKey,locale,typeKey);
data.add(typeMsg); data.add(typeMsg);
data.add(dataLog.getTotalNum());
data.add(dataLog.getSourceName()); data.add(dataLog.getSourceName());
String status = dataLog.getStatus().toLowerCase(); String status = dataLog.getStatus().toLowerCase();
String statusKey = "NeoLight.logStatus." + status; String statusKey = "NeoLight.logStatus." + status;
......
src/main/java/com/neotel/smfcore/security/service/UserDetailsServiceImpl.java
...@@ -69,10 +69,10 @@ public class UserDetailsServiceImpl implements UserDetailsService { ...@@ -69,10 +69,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
}else { }else {
//判断激活码是否正确 //判断激活码是否正确
String code = Md5Utls.getMd5(user.getId(), user.getCreateDate()); /*String code = Md5Utls.getMd5(user.getId(), user.getCreateDate());
if (!code.equals(user.getCheckCode())) { if (!code.equals(user.getCheckCode())) {
throw new ValidateException("smfcore.notActivated","账号未激活"); throw new ValidateException("smfcore.notActivated","账号未激活");
} }*/
} }
List<Long> dataScopes = new ArrayList<>(); List<Long> dataScopes = new ArrayList<>();
jwtUserDto = new JwtUserDto( jwtUserDto = new JwtUserDto(
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!