1.出库单出库任务等待问题修改。

2.齐套无数据问题修改。
3.安全库存展示修改。

src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/ComponentManagerImpl.java

@@ -175,6 +175,9 @@ public class ComponentManagerImpl implements IComponentManager {
         //判断最大库存和最小库存
         if(resources.getMinStoreNum()>0  )
         {
+            if(resources.getMaxStoreNum()==0){
+                resources.setMaxStoreNum(999999999);
+            }
             if(resources.getMinStoreNum()<=resources.getSafetyStoreNum()&& resources.getSafetyStoreNum()<=resources.getMaxStoreNum()){
 
             }else{

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

@@ -205,14 +205,20 @@ public class NLPShelfHandler extends BaseDeviceHandler{
                     color = ORDER_COLOR.DARKGREEN;
                 } else {
                     if (ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
-                        if (queueTask.isInOperate()) {
-                            //首盘料 颜色：CYAN
-                            //截料料 颜色：PURPLE
-                            //普通工单 颜色：SKYBLUE
+                        if (queueTask.getOutType() == 10) {
+                            if (queueTask.isInOperate()) {
+                                //首盘料 颜色：CYAN
+                                //截料料 颜色：PURPLE
+                                //普通工单 颜色：SKYBLUE
+                                String rgb = queueTask.getLightColor();
+                                color = ORDER_COLOR.fromRgb(rgb);
+                            } else {
+                                continue;
+                            }
+                        } else {
+                            // 普通转储出库单 颜色：SKYBLUE
                             String rgb = queueTask.getLightColor();
                             color = ORDER_COLOR.fromRgb(rgb);
-                        } else {
-                            continue;
                         }
                     } else {
                         //普通出库蓝色 BLUE

src/main/java/com/neotel/smfcore/core/order/OrderPnCache.java

@@ -150,9 +150,17 @@ public class OrderPnCache {
             int reelAmount = 1000;//每盘料数量
             if (component != null) {
                 reelAmount = component.getAmount();
+                if (reelAmount == 0) {
+                    reelAmount = 1000;
+                }
             }
 
-            int needReel = lackNum / reelAmount;
+            int needReel = 1;
+            if (lackNum % reelAmount == 0) {
+                needReel = lackNum / reelAmount;
+            } else {
+                needReel = Math.floorDiv(lackNum, reelAmount) + 1;
+            }
 
             OrderPnInfo pnInfo = new OrderPnInfo(pn, needNum, lackNum, stockCount, reelAmount, needReel, new Date());
             orderPnInfoMap.put(pn, pnInfo);

src/main/java/com/neotel/smfcore/core/outList/util/OutListCache.java

@@ -337,17 +337,17 @@ public class OutListCache implements ITaskListener {
 
             }
             outListItem.setNeedReelCount(outListItem.getNeedReelCount()+itemReelCount);
-            outListItem.setTotalOutReelCount(outListItem.getTotalOutReelCount() + itemReelCount);
-            outListItem.setTotalOutNum(outListItem.getTotalOutNum() + itemOutCount);
-            outListItem.setOutReelCount(itemReelCount);
-            outListItem.setOutNum(itemOutCount);
+ //             outListItem.setTotalOutReelCount(outListItem.getTotalOutReelCount() + itemReelCount);
+//            outListItem.setTotalOutNum(outListItem.getTotalOutNum() + itemOutCount);
+//            outListItem.setOutReelCount(itemReelCount);
+//            outListItem.setOutNum(itemOutCount);
             outListItemManager.save(outListItem);
 
         }
         outList.setTaskReelCount(taskReelCount);
         outList.setTotalFinishedReelCount(0);
         outList.setTotalTaskReelCount(outList.getTotalTaskReelCount() + taskReelCount);
-        log.info("转储出库单[" + name + "]任务分配结束,任务数[" + taskReelCount + "]");
+        log.info("转储出库单[" + name + "]任务分配结束,改为执行状态,任务数[" + taskReelCount + "]");
         //有需要出库的
         if (taskReelCount <= 0) {
             outList.finishedTasks();

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

@@ -147,6 +147,7 @@ public class MaterialStockController {
     private List<SafetyInventoryDto> getSafetyInventoryList(SafetyInventoryQueryCriteria criteria) {
         boolean needSupplement = criteria.isNeedSupplement();
         Query query = QueryHelp.getQuery(criteria);
+        query.addCriteria(Criteria.where("safetyStoreNum").gt(0));
         List<Component> componentList = componentManager.findByQuery(query);
         Map<String, InventoryItem> inventoryItemMap = dataCache.getAllInventory(criteria.getStorageIdList(), criteria.getBlurry());
 
@@ -164,10 +165,11 @@ public class MaterialStockController {
             dto.setPartNumber(com.getPartNumber());
             dto.setAmount(com.getAmount());
             dto.setSupplementReel(0);
-            //判断是否需要补充 判断当前盘数是否小于最小盘数
-            if (dto.getStockReel() < com.getMinStoreNum()) {
+            dto.setSafetyStoreNum(com.getSafetyStoreNum());
+            //判断是否需要补充 判断当前盘数是否小于安全盘数
+            if (dto.getStockReel() < com.getSafetyStoreNum()) {
 
-//                if (dto.getStockReel() > 0 && dto.getStockCount() > 0) {
+////                if (dto.getStockReel() > 0 && dto.getStockCount() > 0) {
 //
 //                    int reelCount = dto.getStockCount() / dto.getStockReel();
 //                    //补充盘数
@@ -177,10 +179,10 @@ public class MaterialStockController {
 //                    int needReel = com.getMinStoreNum() / dto.getAmount();
 //                    dto.setSupplementReel(needReel);
 //                }
-                dto.setSupplementReel(com.getMinStoreNum()-dto.getStockReel());
+                dto.setSupplementReel(com.getMinStoreNum() - dto.getStockReel());
             }
-            if (needSupplement   ) {
-                if(dto.getSupplementReel() > 0){
+            if (needSupplement) {
+                if (dto.getSupplementReel() > 0) {
                     results.add(dto);
                 }
             } else {

src/main/java/com/neotel/smfcore/core/storage/rest/dto/SafetyInventoryDto.java

@@ -45,4 +45,7 @@ public class SafetyInventoryDto implements Serializable {
     @ApiModelProperty("需要补充盘数")
     private int supplementReel=0;
 
+    @ApiModelProperty("安全库存")
+    private int safetyStoreNum=0;
+
 }