1.增加虚拟仓操作功能

2.增加neo counter

src/main/java/com/neotel/smfcore/core/equipment/enums/EquipmentType.java

@@ -79,4 +79,9 @@ public enum EquipmentType {
 
         return Lists.newArrayList(NS100.name(),NS200.name());
     }
+
+    public static List<String> neoCounterList(){
+
+        return Lists.newArrayList(NEOCOUNTER.name());
+    }
 }

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -197,9 +197,15 @@ public class EquipViewController {
             EquipGroupDto dto=new EquipGroupDto(MessageUtils.getText("smfcore.equipment.view.nsgroup",locale,"Neo Scan"),nsList);
             list.add(dto);
         }
+        List<EquipStatusDto> neoCounterList=resultList.stream().filter(dto->EquipmentType.neoCounterList().contains(dto.getType())).collect(Collectors.toList());
+        if(neoCounterList.size()>0){
+            EquipGroupDto dto=new EquipGroupDto(MessageUtils.getText("smfcore.equipment.view.ncgroup",locale,"Neo Counter"),neoCounterList);
+            list.add(dto);
+        }
         List<String> otherType= new ArrayList<>();
         otherType.addAll(EquipmentType.nsList());
         otherType.addAll(EquipmentType.apiTypeList() );
+        otherType.addAll(EquipmentType.neoCounterList() );
         List<EquipStatusDto> otherList=resultList.stream().filter(dto->otherType.contains(dto.getType())==false).collect(Collectors.toList());
         if(otherList.size()>0){
             EquipGroupDto dto=new EquipGroupDto("",otherList);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -939,10 +939,10 @@ public class TaskService {
                 if (pos != null) {
                     //判断尺寸是否一致
                     if(isSameSize(barcode,pos)){
-                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，尺寸与条码一致，直接返回");
+                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，物料尺寸与库位尺寸一致，直接返回");
                         return pos;
                     }else if(findPos==null){
-                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，尺寸不一致，先暂存库位");
+                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，物料尺寸与库位尺寸不一致，先暂存库位");
                         findPos=pos;
                     }else if(findPos.getW()> pos.getW()||findPos.getH()>pos.getH()){
                         log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，比暂存库位["+findPos.getPosName()+"]跟匹配，替换为暂存库位");
@@ -961,10 +961,10 @@ public class TaskService {
                 StoragePos pos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds, lastPosId);
                 if (pos != null) {
                     if(isSameSize(barcode,pos)){
-                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，尺寸与条码一致，直接返回");
+                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，物料尺寸与库位尺寸一致，直接返回");
                         return pos;
                     }else if(findPos==null){
-                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，尺寸不一致，先暂存库位");
+                        log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，物料尺寸与库位尺寸不一致，先暂存库位");
                         findPos=pos;
                     }else if(findPos.getW()> pos.getW()||findPos.getH()>pos.getH()){
                         log.info("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找到空位["+pos.getPosName()+"]，比暂存库位["+findPos.getPosName()+"]跟匹配，替换为暂存库位");

src/main/java/com/neotel/smfcore/core/virtual/controller/VirtualOperateController.java

@@ -255,7 +255,7 @@ public class VirtualOperateController {
         String describe = paramMap.get("describe");
 
         //判断料箱是否存在
-        Barcode barcode = barcodeManager.findByBarcode(boxStr);
+        Barcode barcode = codeResolve.resolveOneValideBarcode(boxStr);
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr});
         }

src/main/resources/messages.properties

@@ -430,4 +430,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}]\u5E93\u4F4D\u4E3A[{1}],\u4E0D\u5
 smfcore.virtual=\u865A\u62DF\u4ED3
 smfcore.virtualManager=\u865A\u62DF\u4ED3\u7BA1\u7406
 smfcore.virtualLocationManager=\u865A\u62DF\u5E93\u4F4D\u7BA1\u7406
-smfcore.virtualOperations=\u865A\u62DF\u4ED3\u64CD\u4F5C
\ No newline at end of file
+smfcore.virtualOperations=\u865A\u62DF\u4ED3\u64CD\u4F5C
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_de_DE.properties

@@ -420,4 +420,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}] Lagerplatz [{1}] geh\u00F6rt nic
 smfcore.virtual=Virtuelles Lager
 smfcore.virtualManager=Verwaltung des virtuellen Lagers
 smfcore.virtualLocationManager=Verwaltung virtueller Lagerpl\u00E4tze
-smfcore.virtualOperations=Vorg\u00E4nge im virtuellen Lager
\ No newline at end of file
+smfcore.virtualOperations=Vorg\u00E4nge im virtuellen Lager
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -421,4 +421,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}] Storage location [{1}] does not
 smfcore.virtual=Virtual Storage
 smfcore.virtualManager=Virtual Storage Mgmt
 smfcore.virtualLocationManager=Virtual Location Mgmt
-smfcore.virtualOperations=Virtual Storage Op
\ No newline at end of file
+smfcore.virtualOperations=Virtual Storage Op
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -420,4 +420,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}] L'emplacement [{1}] n'appartient
 smfcore.virtual=Entrep\u00F4t virtuel
 smfcore.virtualManager=Gestion de l'entrep\u00F4t virtuel
 smfcore.virtualLocationManager=Gestion des emplacements virtuels
-smfcore.virtualOperations=Op\u00E9rations de l'entrep\u00F4t virtuel
\ No newline at end of file
+smfcore.virtualOperations=Op\u00E9rations de l'entrep\u00F4t virtuel
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -417,4 +417,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}] \u30ED\u30B1\u30FC\u30B7\u30E7\u
 smfcore.virtual=\u4EEE\u60F3\u5009\u5EAB
 smfcore.virtualManager=\u4EEE\u60F3\u5009\u5EAB\u7BA1\u7406
 smfcore.virtualLocationManager=\u4EEE\u60F3\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u7BA1\u7406
-smfcore.virtualOperations=\u4EEE\u60F3\u5009\u5EAB\u64CD\u4F5C
\ No newline at end of file
+smfcore.virtualOperations=\u4EEE\u60F3\u5009\u5EAB\u64CD\u4F5C
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -417,4 +417,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}]\u5E93\u4F4D\u4E3A[{1}],\u4E0D\u5
 smfcore.virtual=\u865A\u62DF\u4ED3
 smfcore.virtualManager=\u865A\u62DF\u4ED3\u7BA1\u7406
 smfcore.virtualLocationManager=\u865A\u62DF\u5E93\u4F4D\u7BA1\u7406
-smfcore.virtualOperations=\u865A\u62DF\u4ED3\u64CD\u4F5C
\ No newline at end of file
+smfcore.virtualOperations=\u865A\u62DF\u4ED3\u64CD\u4F5C
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -417,4 +417,5 @@ smfcore.virtual.barcodeNotExistVirtualPos=[{0}]\u5EAB\u4F4D\u70BA[{1}]\uFF0C\u4E
 smfcore.virtual=\u865B\u64EC\u5009
 smfcore.virtualManager=\u865B\u64EC\u5009\u7BA1\u7406
 smfcore.virtualLocationManager=\u865B\u64EC\u5EAB\u4F4D\u7BA1\u7406
-smfcore.virtualOperations=\u865B\u64EC\u5009\u64CD\u4F5C
\ No newline at end of file
+smfcore.virtualOperations=\u865B\u64EC\u5009\u64CD\u4F5C
+smfcore.equipment.view.ncgroup=Neo Counter
\ No newline at end of file