PN库存只显示数量>0的数据

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

@@ -10,6 +10,8 @@ import com.neotel.smfcore.core.message.enums.MessageType;
 import com.neotel.smfcore.core.message.service.manager.IMessageManager;
 import com.neotel.smfcore.core.message.service.manager.IMessageManager;
 import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.order.util.OrderFileWatch;
 import com.neotel.smfcore.core.order.util.OrderFileWatch;
+import com.neotel.smfcore.custom.micron1053.api.APIMODE;
+import com.neotel.smfcore.custom.micron1053.task.bean.dto.TaskDto;
 import com.neotel.smfcore.security.service.manager.IMenuManager;
 import com.neotel.smfcore.security.service.manager.IMenuManager;
 import com.neotel.smfcore.security.service.manager.IRoleManager;
 import com.neotel.smfcore.security.service.manager.IRoleManager;
 import com.neotel.smfcore.security.service.manager.IUserManager;
 import com.neotel.smfcore.security.service.manager.IUserManager;
@@ -112,6 +114,27 @@ public class DataInitManager {
 
 
             dataCache.getAllInventory(null,"");
             dataCache.getAllInventory(null,"");
 
 
+            //未完成的dto改为非处理状态
+            String[] apiMode=new String[]{APIMODE.PCBPRETASK,APIMODE.MCLPRETASK,APIMODE.LINEPREP,APIMODE.CTRLDISPATCH,APIMODE.OUTSIDESHELF};
+            for (String mode :
+                    apiMode) {
+
+                TaskDto dto = new TaskDto();
+                String key = Constants.CACHE_DISPATCH + mode;
+                //先从缓存中获取数据
+                try{
+                      dto = dataCache.getCache(key);
+                }catch (Exception ex){
+
+                }
+                if(dto!=null&&dto.getApiProStatus()==1){
+                    log.info("mode="+mode+",当前getApiProStatus=1，operationId="+dto.getOperationId()+",更改为0");
+                    dto.setApiProStatus(0);
+                    dataCache.updateCache(key,dto);
+                }
+
+            }
+
         } catch (Exception exception) {
         } catch (Exception exception) {
             log.error("初始化环境出错..." + exception.toString(),exception);
             log.error("初始化环境出错..." + exception.toString(),exception);
         }
         }

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

@@ -108,7 +108,7 @@ public class MaterialController {
         List<InventoryItemDto> resultList = new ArrayList<>();
         List<InventoryItemDto> resultList = new ArrayList<>();
         //过滤掉没有库存的
         //过滤掉没有库存的
         for (InventoryItemDto inventoryItemDto : dtoList) {
         for (InventoryItemDto inventoryItemDto : dtoList) {
-            if(inventoryItemDto.getStockReel() > 0){
+            if(inventoryItemDto.getStockReel() > 0 && inventoryItemDto.getStockCount()>0) {
                 resultList.add(inventoryItemDto);
                 resultList.add(inventoryItemDto);
             }
             }
         }
         }