增加过期物料菜单

工单表增加索引

src/main/java/com/neotel/smfcore/SmfCoreApplication.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore;
 
 
 import com.neotel.smfcore.security.annotation.AnonymousGetMapping;
 import com.neotel.smfcore.security.annotation.AnonymousGetMapping;
 import com.neotel.smfcore.common.utils.SpringContextHolder;
 import com.neotel.smfcore.common.utils.SpringContextHolder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -32,6 +33,13 @@ public class SmfCoreApplication extends SpringBootServletInitializer {
 		return builder.sources(SmfCoreApplication.class);
 		return builder.sources(SmfCoreApplication.class);
 	}
 	}
 
 
+
+	/**
+	 * 当前版本
+	 */
+	@Value("${app.version}")
+	private String version;
+
 	/**
 	/**
 	 * 访问首页提示
 	 * 访问首页提示
 	 *
 	 *
@@ -39,7 +47,7 @@ public class SmfCoreApplication extends SpringBootServletInitializer {
 	 */
 	 */
 	@AnonymousGetMapping("/")
 	@AnonymousGetMapping("/")
 	public String index() {
 	public String index() {
-		return "SMF service started successfully";
+		return "SMF service started successfully, version:" + version;
 	}
 	}
 
 
 }
 }

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

@@ -175,6 +175,7 @@ public class DataInitManager {
         addNewFunctionMenu(8, poutOut, "singleDiskWarehousing", "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon",functionMenuMap);
         addNewFunctionMenu(8, poutOut, "singleDiskWarehousing", "单盘入库", "singleDiskWarehousing", "system/singleDiskWarehousing/index", "headIcon",functionMenuMap);
         addNewFunctionMenu(9, poutOut, "sluggishMaterials", "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial",functionMenuMap);
         addNewFunctionMenu(9, poutOut, "sluggishMaterials", "呆滞物料", "sluggishMaterials", "system/sluggishMaterials/index",  "sMaterial",functionMenuMap);
         addNewFunctionMenu(10,poutOut, "safetyInventory", "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory",functionMenuMap);
         addNewFunctionMenu(10,poutOut, "safetyInventory", "安全库存", "safetyInventory", "system/safetyInventory/index", "safeInventory",functionMenuMap);
+        addNewFunctionMenu(11, poutOut, "expireMaterials", "过期物料", "expireMaterials", "system/expireMaterials/index",  "sMaterial",functionMenuMap);
 
 
 
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         //MSD管理：MSD库存.MSD追溯性.MSD设置

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -61,7 +61,7 @@ public class DeviceController {
 
 
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
         for (IDeviceHandler deviceHandler : deviceHandlerList) {
         for (IDeviceHandler deviceHandler : deviceHandlerList) {
-            log.info("加载到" + deviceHandler.getDeviceType() + "处理类 :" + deviceHandler.getClass());
+            //log.info("加载到" + deviceHandler.getDeviceType() + "处理类 :" + deviceHandler.getClass());
             handlerMap.put(deviceHandler.getDeviceType().name(), deviceHandler);
             handlerMap.put(deviceHandler.getDeviceType().name(), deviceHandler);
         }
         }
     }
     }

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

@@ -80,7 +80,11 @@ public class MessageUtils {
 
 
     @PostConstruct
     @PostConstruct
     public void initialize() {
     public void initialize() {
-        initLanguageMsgList();
+        try{
+            initLanguageMsgList();
+        }catch (Exception e){
+            log.error("语言信息导入出错",e);
+        }
     }
     }
 
 
 
 

src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderManagerImpl.java

@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
+@Slf4j
 public class LiteOrderManagerImpl implements ILiteOrderManager {
 public class LiteOrderManagerImpl implements ILiteOrderManager {
 
 
     @Autowired
     @Autowired
@@ -88,8 +89,8 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
         c.and("status").nin(LITEORDER_STATUS.CLOSED);
         c.and("status").nin(LITEORDER_STATUS.CLOSED);
         Query query = new Query(c);
         Query query = new Query(c);
         List<LiteOrder> orders = findByQuery(query);
         List<LiteOrder> orders = findByQuery(query);
-        for (LiteOrder order : orders
-        ) {
+        log.info("加载到["+orders.size()+"]个未完成需求单,开始加载需求单详情");
+        for (LiteOrder order : orders) {
             if (order != null && order.getOrderItems() == null) {
             if (order != null && order.getOrderItems() == null) {
                 List<LiteOrderItem> items = liteOrderItemManager.findOrderItems(order.getId());
                 List<LiteOrderItem> items = liteOrderItemManager.findOrderItems(order.getId());
                 order.setOrderItems(items);
                 order.setOrderItems(items);

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -3,6 +3,7 @@ package com.neotel.smfcore.core.order.service.po;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Transient;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
@@ -53,6 +54,7 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
     /**
     /**
      * 订单信息
      * 订单信息
      */
      */
+    @Indexed
     private String orderId = "";
     private String orderId = "";
     /**
     /**
      * 站位编号,料架工单出库时，亮灯指引功能排序
      * 站位编号,料架工单出库时，亮灯指引功能排序

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialStockController.java

@@ -84,6 +84,26 @@ public class MaterialStockController {
 ////        FileUtil.downloadExcel(maps, response);
 ////        FileUtil.downloadExcel(maps, response);
 //    }
 //    }
 
 
+    @ApiOperation("获取过期物料列表")
+    @GetMapping(value = "/expireMaterials")
+    @PreAuthorize("@el.check('expireMaterials')")
+    public PageData<StoragePosDto> expireMaterials(StoragePosFindCriteria criteria, Pageable pageable, HttpServletRequest request) {
+
+        if (criteria.getStorageId() != null && criteria.getStorageId().equals("0")) {
+            criteria.setStorageId(null);
+        }
+        Query query = QueryHelp.getQuery(criteria);
+        Criteria baseCriteria = Criteria.where("used").is(true);
+
+        //需要查询已经超过过期日期的物料
+        baseCriteria.and("barcode.expireDate").lte(new Date());
+//        baseCriteria.and("barcode.sluggishTime").gte(new Date());
+
+        query.addCriteria(baseCriteria);
+        PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
+        List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
+        return new PageData(StoragePosDtos, pages.getTotalElements());
+    }
 
 
     @ApiOperation("获取呆滞物料列表")
     @ApiOperation("获取呆滞物料列表")
     @GetMapping(value = "/sluggishMaterials")
     @GetMapping(value = "/sluggishMaterials")

src/main/java/com/neotel/smfcore/custom/siemens/SiemensConfig.java

@@ -50,6 +50,6 @@ public class SiemensConfig {
 //        action_ProcessMaterialLot = dataCache.GetConfigCache("siemens.action.ProcessMaterialLot", "siemens.action.ProcessMaterialLot", action_ProcessMaterialLot);
 //        action_ProcessMaterialLot = dataCache.GetConfigCache("siemens.action.ProcessMaterialLot", "siemens.action.ProcessMaterialLot", action_ProcessMaterialLot);
 
 
 
 
-        log.info("siemens服务器rul：" + url + ",url_checkIn=" + url_checkIn );
+        //log.info("siemens服务器rul：" + url + ",url_checkIn=" + url_checkIn );
     }
     }
 }
 }

src/main/resources/config/application-prod.yml

@@ -11,6 +11,7 @@ login:
 spring:
 spring:
   data:
   data:
     mongodb:
     mongodb:
+      auto-index-creation: true # 默认为false，即不会自动创建索引
       host: localhost  # 主机地址
       host: localhost  # 主机地址
       port: 27017           # 端口
       port: 27017           # 端口
       database: smf        # 数据库
       database: smf        # 数据库

src/main/resources/config/application.yml

@@ -26,6 +26,7 @@ spring:
     time-zone: GMT+8
     time-zone: GMT+8
   data:
   data:
       mongodb:
       mongodb:
+        auto-index-creation: true # 默认为false，即不会自动创建索引
         host: localhost  # 主机地址
         host: localhost  # 主机地址
         port: 27017           # 端口
         port: 27017           # 端口
         database: smf       # 数据库
         database: smf       # 数据库
@@ -44,6 +45,6 @@ app:
   type: ""
   type: ""
 
 
 menu:
 menu:
-  show: orderSetting
+  show:
   hide:
   hide: