1.给CTU返回空隔口信息增加库位字段

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -462,7 +462,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
             c = c.and("storageId").is(storageId);
             c = c.and("storageId").is(storageId);
         }
         }
         Query query = new Query(c);
         Query query = new Query(c);
-        query.fields().include("barcode.posName","barcode.barcode","barcode.status","barcode.subCodeList.posName","barcode.partNumber").exclude("id");
+        query.fields().include("barcode.posName","barcode.barcode","barcode.status","barcode.subCodeList.posName","barcode.partNumber","posName").exclude("id");
         return storagePosDao.findByQuery(query);
         return storagePosDao.findByQuery(query);
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -795,10 +795,9 @@ public class CDeviceController {
             callAgvTask(stackerId, stackerBarcode);
             callAgvTask(stackerId, stackerBarcode);
         } catch (Exception e) {
         } catch (Exception e) {
             log.info("入料机构获取可用料格:"+stackerId+"结果异常:"+e.getMessage());
             log.info("入料机构获取可用料格:"+stackerId+"结果异常:"+e.getMessage());
-            //e.printStackTrace();
-            isProcess.set(false);
+            e.printStackTrace();
+            return ResultBean.newErrorResult(-1,"",stackerId+"获取可用料格失败:"+e.getMessage());
         }
         }
-
         isProcess.set(false);
         isProcess.set(false);
         log.info("入料机构获取可用料格:"+stackerId+"返回的数据为:"+JSON.toJSONString(validBin));
         log.info("入料机构获取可用料格:"+stackerId+"返回的数据为:"+JSON.toJSONString(validBin));
         return ResultBean.newOkResult(validBin);
         return ResultBean.newOkResult(validBin);

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java

@@ -438,6 +438,7 @@ public class CtuDeviceController {
                 String warehouseCode = StringUtils.isNotEmpty(binCodeCacheMap.get(binCode)) ? binCodeCacheMap.get(binCode) : "";
                 String warehouseCode = StringUtils.isNotEmpty(binCodeCacheMap.get(binCode)) ? binCodeCacheMap.get(binCode) : "";
                 resultMap.put("warehouseCode",warehouseCode);
                 resultMap.put("warehouseCode",warehouseCode);
                 resultMap.put("remainNum",count);
                 resultMap.put("remainNum",count);
+                resultMap.put("posName",pos.getPosName());
                 resultList.add(resultMap);
                 resultList.add(resultMap);
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BinCacheUtil.java

@@ -448,7 +448,7 @@ public class BinCacheUtil {
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();
         if (subCodeList != null) {
         if (subCodeList != null) {
             for (Barcode barcode : subCodeList) {
             for (Barcode barcode : subCodeList) {
-                if (barcode.getPosName().equals(binId)) {
+                if (binId.equals(barcode.getPosName())) {
                     //因为bin中的物料都是一样的料号,供应商,库别,过账日期,所以只需要找到Bin中的第一个物料进行比对就可以了
                     //因为bin中的物料都是一样的料号,供应商,库别,过账日期,所以只需要找到Bin中的第一个物料进行比对就可以了
                     if (!barcode.getPartNumber().equals(reelBarcode.getPartNumber())) {
                     if (!barcode.getPartNumber().equals(reelBarcode.getPartNumber())) {
                         return "料格中[" + binId + "]物料的料号[" + barcode.getPartNumber() + "]与[" + reelBarcode.getBarcode() + "]的料号[" + reelBarcode.getPartNumber() + "]不一致";
                         return "料格中[" + binId + "]物料的料号[" + barcode.getPartNumber() + "]与[" + reelBarcode.getBarcode() + "]的料号[" + reelBarcode.getPartNumber() + "]不一致";