Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 81beb4d3 由 sunke
选项

设备IP展示修正 

重设用户密码修正
1 个父辈 6e0aad20
内嵌 并排
正在显示 9 个修改的文件 包含 20 行增加 和 32 行删除
src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java
...@@ -225,7 +225,11 @@ public class BarcodeDto implements Serializable { ...@@ -225,7 +225,11 @@ public class BarcodeDto implements Serializable {
@ApiModelProperty("料盒内所有物料条码") @ApiModelProperty("料盒内所有物料条码")
private List<Barcode> subCodeList; private List<BarcodeDto> subCodeList;
public List<BarcodeDto> getChildren(){
return subCodeList;
}
public String getPutInTimeStr() { public String getPutInTimeStr() {
......
src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/BarcodeManagerImpl.java
...@@ -156,7 +156,6 @@ public class BarcodeManagerImpl implements IBarcodeManager { ...@@ -156,7 +156,6 @@ public class BarcodeManagerImpl implements IBarcodeManager {
resources.setType(component.getType()); resources.setType(component.getType());
resources.setWarmTime(component.getWarmTime()); resources.setWarmTime(component.getWarmTime());
resources.setMixTime(component.getMixTime()); resources.setMixTime(component.getMixTime());
resources.setOtherField1(component.getProductionType());
if(resources.getPlateSize() <= 0){ if(resources.getPlateSize() <= 0){
log.info("设置置["+resources.getBarcode()+"]的尺寸信息"); log.info("设置置["+resources.getBarcode()+"]的尺寸信息");
resources.setPlateSize(component.getPlateSize()); resources.setPlateSize(component.getPlateSize());
......
src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java
...@@ -92,18 +92,6 @@ public class Barcode extends BasePo implements Serializable { ...@@ -92,18 +92,6 @@ public class Barcode extends BasePo implements Serializable {
*/ */
private String msl; private String msl;
//备用字段1（配套单号)）或 family
private String otherField1;
//备用字段2 （产品型号）
private String otherField2;
//备用字段3 （组件型号）
private String otherField3;
//备用字段4 （元器件型号）
private String otherField4;
//备用字段5 （检验编号）
private String otherField5;
//备用字段5 （备注）
private String otherField6;
/** /**
* 包装上带的过期时间 * 包装上带的过期时间
*/ */
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java
...@@ -757,6 +757,7 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -757,6 +757,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
statusBean.setStatus(statusBeanToSave.getStatus()); statusBean.setStatus(statusBeanToSave.getStatus());
statusBean.setOp(statusBeanToSave.getOp()); statusBean.setOp(statusBeanToSave.getOp());
statusBean.setSeq(statusBeanToSave.getSeq()); statusBean.setSeq(statusBeanToSave.getSeq());
statusBean.setClientIp(statusBeanToSave.getClientIp());
/** /**
* 已解除的报警信息存到数据库中 * 已解除的报警信息存到数据库中
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java
...@@ -330,7 +330,7 @@ public class NLShelfHandler extends BaseDeviceHandler { ...@@ -330,7 +330,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
if (inPos != null) { if (inPos != null) {
Collection<DataLog> allTasks = taskService.getQueueTasks(); Collection<DataLog> allTasks = taskService.getQueueTasks();
for (DataLog task : allTasks) { for (DataLog task : allTasks) {
if (task.isCheckOutTask() && task.getBarcode() != null && task.getBarcode().equals(code)) { if (task.isCheckOutTask() && task.getBarcode() != null && task.getBarcode().equals(barcode.getBarcode())) {
if(ObjectUtil.isNotEmpty(sourceId) && !sourceId.equals(task.getSourceId())) { if(ObjectUtil.isNotEmpty(sourceId) && !sourceId.equals(task.getSourceId())) {
LiteOrder liteOrder = liteOrderManager.get(sourceId); LiteOrder liteOrder = liteOrderManager.get(sourceId);
if (liteOrder != null) { if (liteOrder != null) {
......
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -11,6 +11,7 @@ import com.neotel.smfcore.common.utils.FileUtil; ...@@ -11,6 +11,7 @@ import com.neotel.smfcore.common.utils.FileUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.common.utils.SecurityUtils; import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.core.barcode.bean.CodeBean; import com.neotel.smfcore.core.barcode.bean.CodeBean;
import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
import com.neotel.smfcore.core.barcode.rest.bean.dto.CodeDto; import com.neotel.smfcore.core.barcode.rest.bean.dto.CodeDto;
import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.CodeMapper; import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.CodeMapper;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
...@@ -317,6 +318,12 @@ public class StoragePosController { ...@@ -317,6 +318,12 @@ public class StoragePosController {
Query query=getPosFindCriteria(criteria); Query query=getPosFindCriteria(criteria);
PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable); PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent()); List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
// for (StoragePosDto storagePosDto : StoragePosDtos) {
// BarcodeDto barcode = storagePosDto.getBarcode();
// List<BarcodeDto> subCodes = Lists.newArrayList(barcode);
// barcode.setSubCodeList(subCodes);
// storagePosDto.setBarcode(barcode);
// }
return new PageData(StoragePosDtos, pages.getTotalElements()); return new PageData(StoragePosDtos, pages.getTotalElements());
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java
...@@ -14,7 +14,7 @@ import java.util.List; ...@@ -14,7 +14,7 @@ import java.util.List;
@Data @Data
public class StoragePosFindCriteria { public class StoragePosFindCriteria {
@QueryCondition(blurry = "barcode.partNumber,barcode.barcode,posName") @QueryCondition(blurry = "barcode.partNumber,barcode.barcode,barcode.subCodeList.barcode,barcode.subCodeList.partNumber,posName")
private String blurry; private String blurry;
@QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate") @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
...@@ -67,16 +67,6 @@ public class StoragePosFindCriteria { ...@@ -67,16 +67,6 @@ public class StoragePosFindCriteria {
@QueryCondition(blurry = "barcode.provider") @QueryCondition(blurry = "barcode.provider")
private String provider; private String provider;
@QueryCondition(blurry = "barcode.otherField1")
private String otherField1;
@QueryCondition(blurry = "barcode.otherField2")
private String otherField2;
@QueryCondition(blurry = "barcode.otherField3")
private String otherField3;
@QueryCondition(blurry = "barcode.otherField4")
private String otherField4;
@QueryCondition(blurry = "barcode.otherField5")
private String otherField5;
@QueryCondition(propName = "barcode.msl") @QueryCondition(propName = "barcode.msl")
@ApiModelProperty("等级") @ApiModelProperty("等级")
......
src/main/java/com/neotel/smfcore/security/rest/UserController.java
...@@ -162,12 +162,11 @@ public class UserController { ...@@ -162,12 +162,11 @@ public class UserController {
if (id == null) { if (id == null) {
throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} ); throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} );
} }
log.info("重置用户["+id+"]密码");
User resources=userManager.get(id); User resources=userManager.get(id);
resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD)); userManager.updatePass(resources.getUsername(), passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
resources.setPwdResetTime(new Date());
userManager.update(resources);
userCacheClean.cleanUserCache(resources.getUsername()); userCacheClean.cleanUserCache(resources.getUsername());
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
} }
@ApiOperation("个人中心：获取个人资料") @ApiOperation("个人中心：获取个人资料")
@GetMapping(value = "/center") @GetMapping(value = "/center")
......
src/main/resources/config/application.yml
...@@ -2,7 +2,7 @@ server: ...@@ -2,7 +2,7 @@ server:
port: 8800 port: 8800
api: api:
#name: DaLu #name: Neotel
#inCheckUrl: DaLu #inCheckUrl: DaLu
#outNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/OutBox #outNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/OutBox
#inNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/InBox #inNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/InBox
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: '@package.environment@' active: 'prod'
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!