bug修改

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -273,6 +273,12 @@ public class MenuInit {
             Menu showMenu = allMenus.get(showPath);
             Menu showMenu = allMenus.get(showPath);
             if(showMenu != null){
             if(showMenu != null){
                 showMenu = createMenu(showMenu);
                 showMenu = createMenu(showMenu);
+                //不隐藏
+                if(showMenu.getHidden()){
+                    showMenu.setHidden(false);
+                    menuManager.saveMenu(showMenu);
+                    log.info("显示隐藏菜单:" + showMenu.getPath());
+                }
                 addToMenuIdSet(showIdSet,showMenu);
                 addToMenuIdSet(showIdSet,showMenu);
             }else{
             }else{
                 for (Menu menu : allMenus.values()) {
                 for (Menu menu : allMenus.values()) {
@@ -280,6 +286,12 @@ public class MenuInit {
                         showMenu = createMenu(menu);
                         showMenu = createMenu(menu);
                         log.info("展示菜单:" + menu.getPath());
                         log.info("展示菜单:" + menu.getPath());
                         addToMenuIdSet(showIdSet,menu);
                         addToMenuIdSet(showIdSet,menu);
+                        //不隐藏
+                        if(showMenu.getHidden()){
+                            showMenu.setHidden(false);
+                            menuManager.saveMenu(showMenu);
+                            log.info("2显示隐藏菜单:" + showMenu.getPath());
+                        }
                     }
                     }
                 }
                 }
             }
             }

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -364,7 +364,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
         Collection<String> operatingPosIds =taskService.excludePosIds();
         Collection<String> operatingPosIds =taskService.excludePosIds();
 
 
 //        是否有出库任务
 //        是否有出库任务
-        if (storage.isSmdDuo() || storage.isBatchStorage()) {
+        if (storage.isSmdDuo() || storage.isBatchStorage()||storage.isAuto()) {
             //DUO料仓和MIMO客户端缓存出库任务,入库优先
             //DUO料仓和MIMO客户端缓存出库任务,入库优先
             log.info("从" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
             log.info("从" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
             storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
             storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);

src/main/java/com/neotel/smfcore/core/inList/rest/bean/dto/InListItemDto.java

@@ -38,4 +38,7 @@ public class InListItemDto implements Serializable {
 
 
     @ApiModelProperty(value = "入库详情")
     @ApiModelProperty(value = "入库详情")
     private List<ItemReelInfo> reelLists;
     private List<ItemReelInfo> reelLists;
+
+    @ApiModelProperty(value = "超时未完成，已发送邮件通知")
+    private boolean sendEmail=false;
 }
 }

src/main/java/com/neotel/smfcore/core/inList/rest/bean/query/InListItemQueryCriteria.java

@@ -2,10 +2,11 @@ package com.neotel.smfcore.core.inList.rest.bean.query;
 
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.bean.BetweenData;
 import com.neotel.smfcore.common.bean.BetweenData;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.util.Date;
 import java.util.Date;
-
+@Data
 public class InListItemQueryCriteria {
 public class InListItemQueryCriteria {
     @QueryCondition(blurry = "name,PN,ri")
     @QueryCondition(blurry = "name,PN,ri")
     private String blurry;
     private String blurry;
@@ -22,4 +23,6 @@ public class InListItemQueryCriteria {
 
 
     @QueryCondition(blurry = "ri")
     @QueryCondition(blurry = "ri")
     private String ri;
     private String ri;
+    @QueryCondition(blurry = "sendEmail")
+    private Boolean sendEmail;
 }
 }

src/main/java/com/neotel/smfcore/core/language/util/LanguageMsgService.java

@@ -340,7 +340,7 @@ public class LanguageMsgService {
                     String oldValue = oldMsg.getContent(lanType);
                     String oldValue = oldMsg.getContent(lanType);
                     String newValue = msg.getContent(lanType);
                     String newValue = msg.getContent(lanType);
                     if (ObjectUtil.isNotEmpty(newValue)) {
                     if (ObjectUtil.isNotEmpty(newValue)) {
-                        if (isNeedUpdate || ObjectUtil.isEmpty(oldValue)) {
+                        if (ObjectUtil.isEmpty(oldValue)||(isNeedUpdate &&(!newValue.equals(oldValue))) ) {
                             oldMsg.setContent(lanType, newValue);
                             oldMsg.setContent(lanType, newValue);
                             isUpdate = true;
                             isUpdate = true;
                             //内容默认更改为中文
                             //内容默认更改为中文

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -92,10 +92,10 @@ public class MessageUtils {
     private void initLanguageMsgList() {
     private void initLanguageMsgList() {
         msgMap = messageService.loadMsgMap();
         msgMap = messageService.loadMsgMap();
 
 
-        //自动导入JSON内容
-        messageService.autoImportJsonFile();
         //只新增不修改
         //只新增不修改
         messageService.autoImportResources();
         messageService.autoImportResources();
+        //自动导入JSON内容
+        messageService.autoImportJsonFile();
         if (msgMap.size() > 0) {
         if (msgMap.size() > 0) {
             return;
             return;
         }
         }

src/main/java/com/neotel/smfcore/custom/micron20031/MicronAbnormalityReportsController.java

@@ -68,6 +68,7 @@ public class MicronAbnormalityReportsController {
     @AnonymousAccess
     @AnonymousAccess
     public PageData<InListItemDto> incompleteInlist(InListItemQueryCriteria criteria, Pageable pageable, HttpServletRequest request) {
     public PageData<InListItemDto> incompleteInlist(InListItemQueryCriteria criteria, Pageable pageable, HttpServletRequest request) {
 
 
+        criteria.setSendEmail(true);
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         PageData<InListItem> pages = inListItemManager.findByPage(query, pageable);
         PageData<InListItem> pages = inListItemManager.findByPage(query, pageable);
         List<InListItemDto> itemDtos = inListItemMapper.toDto(pages.getContent());
         List<InListItemDto> itemDtos = inListItemMapper.toDto(pages.getContent());

src/main/java/com/neotel/smfcore/custom/micron20031/MicronInventoryReportsController.java

@@ -187,7 +187,8 @@ public class MicronInventoryReportsController {
         types.add("");
         types.add("");
         for (String type : types) {
         for (String type : types) {
 
 
-            List<SpDailyLog> logs = dataLogManager.getSpPnSummaryLists(type);
+//            List<SpDailyLog> logs = dataLogManager.getSpPnSummaryLists(type);
+            List<SpDailyLog> logs = dataLogManager.getSpPnSummaryLists("");
             for (SpDailyLog log :
             for (SpDailyLog log :
                     logs) {
                     logs) {
                 SpDailyLogDto dto = dailyLogDtos.getOrDefault(log.getPartNumber(), new SpDailyLogDto());
                 SpDailyLogDto dto = dailyLogDtos.getOrDefault(log.getPartNumber(), new SpDailyLogDto());