Merge remote-tracking branch 'origin/master' into micron1053

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -225,7 +225,11 @@ public class BarcodeDto implements Serializable {
 
 
     @ApiModelProperty("料盒内所有物料条码")
-    private List<Barcode> subCodeList;
+    private List<BarcodeDto> subCodeList;
+
+    public List<BarcodeDto> getChildren(){
+        return subCodeList;
+    }
 
 
     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 {
             resources.setType(component.getType());
             resources.setWarmTime(component.getWarmTime());
             resources.setMixTime(component.getMixTime());
-            resources.setOtherField1(component.getProductionType());
             if(resources.getPlateSize() <= 0){
                 log.info("设置置["+resources.getBarcode()+"]的尺寸信息");
                 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 {
      */
     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 {
         statusBean.setStatus(statusBeanToSave.getStatus());
         statusBean.setOp(statusBeanToSave.getOp());
         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 {
         if (inPos != null) {
             Collection<DataLog> allTasks = taskService.getQueueTasks();
             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())) {
                         LiteOrder liteOrder = liteOrderManager.get(sourceId);
                         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;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 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.mapstruct.CodeMapper;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -317,6 +318,12 @@ public class StoragePosController {
         Query query=getPosFindCriteria(criteria);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         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());
     }
 

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Data
 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;
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
@@ -67,16 +67,6 @@ public class StoragePosFindCriteria {
 
     @QueryCondition(blurry = "barcode.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")
     @ApiModelProperty("等级")

src/main/java/com/neotel/smfcore/security/rest/UserController.java

@@ -162,10 +162,9 @@ public class UserController {
         if (id == null) {
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} );
         }
+        log.info("重置用户["+id+"]密码");
         User resources=userManager.get(id);
-        resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
-        resources.setPwdResetTime(new Date());
-        userManager.update(resources);
+        userManager.updatePass(resources.getUsername(), passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
         userCacheClean.cleanUserCache(resources.getUsername());
         return ResultBean.newOkResult("");
     }

src/main/java/com/neotel/smfcore/security/service/po/Menu.java

@@ -40,6 +40,7 @@ public class Menu extends BasePo implements Serializable {
     /**
      * 子菜单
      */
+    @Transient
     private List<Menu> children;
     /**
      * 菜单类型

src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8800
 
 api:
-  #name: DaLu
+  #name: Neotel
   #inCheckUrl: DaLu
   #outNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/OutBox
   #inNotifyUrl: https://matlabel-tool.com:4434/SMD_BOXAPI/InBox
@@ -18,7 +18,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: '@package.environment@'
+    active: 'prod'
   jackson:
     time-zone: GMT+8
   data: