增加lastReelH

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -285,6 +285,9 @@ public class StatusBean {
     public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut ){
     public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut ){
         addPosInfo(barcode,posId,plateW,plateH,isSingleOut,false,0);
         addPosInfo(barcode,posId,plateW,plateH,isSingleOut,false,0);
     }
     }
+      public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,int usedCount ){
+        addPosInfo(barcode,posId,plateW,plateH,isSingleOut,isNgReel,usedCount,0);
+      }
     /**
     /**
      * 获取客户端发送上来的条码信息
      * 获取客户端发送上来的条码信息
      */
      */
@@ -294,7 +297,7 @@ public class StatusBean {
     /**
     /**
      * 入库时添加仓位及料盘大小信息(posId库位编号，plateW:料盘宽度,plateH:料盘高度,singleOut:是否出库到料仓门口)
      * 入库时添加仓位及料盘大小信息(posId库位编号，plateW:料盘宽度,plateH:料盘高度,singleOut:是否出库到料仓门口)
      */
      */
-    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,int usedCount){
+    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,int usedCount,int lastReelH){
         String originalPosId = data.get("posId");
         String originalPosId = data.get("posId");
         String originalPlateW = data.get("plateW");
         String originalPlateW = data.get("plateW");
         String originalPlateH = data.get("plateH");
         String originalPlateH = data.get("plateH");
@@ -329,6 +332,9 @@ public class StatusBean {
             data.put("ngMsg","Repeat Inbound");
             data.put("ngMsg","Repeat Inbound");
         }
         }
         data.put("usedCount",usedCount+"" );
         data.put("usedCount",usedCount+"" );
+        if(lastReelH>0){
+            data.put("lastReelH",lastReelH+"");
+        }
     }
     }
 
 
     /**
     /**

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

@@ -306,14 +306,23 @@ public class BaseDeviceHandler implements IDeviceHandler {
                     putInTask.setInOutType(MInOutType.RETURNED);
                     putInTask.setInOutType(MInOutType.RETURNED);
                 }
                 }
             }
             }
+            int lastReelP=0;
+            StoragePos pos=storagePosManager.getByPosName(putInTask.getPosName());
+            if(ObjectUtil.isNotEmpty(pos.getLastReelH())&&pos.getLastReelH()>0){
+                  lastReelP=pos.getLastReelH();
+            }
 
 
 
 
             String posId = putInTask.getPosName();
             String posId = putInTask.getPosName();
             int plateW = barcodeSave.getPlateSize();
             int plateW = barcodeSave.getPlateSize();
             int plateH = barcodeSave.getHeight();
             int plateH = barcodeSave.getHeight();
-            statusBean.addPosInfo(barcodeSave.getBarcode(), posId, plateW, plateH, false,false,barcodeSave.getUsedCount());
+            statusBean.addPosInfo(barcodeSave.getBarcode(), posId, plateW, plateH, false,false,barcodeSave.getUsedCount(),lastReelP);
+
+            //记录这一盘的高度
+            pos.setLastReelH(barcodeSave.getHeight());
+            storagePosManager.save(pos);
 
 
-            log.info(barcodeSave.getBarcode() + "[" + plateW + "x" + plateH + "]开始入库到" + storage.getCid() + "[" + posId + "]");
+            log.info(barcodeSave.getBarcode() + "[" + plateW + "x" + plateH + "]开始入库到" + storage.getCid() + "[" + posId + "], lastReelP=["+lastReelP+"],当前高度=["+barcodeSave.getHeight()+"]");
             //清空展示的消息
             //清空展示的消息
 
 
             serverExceptions.remove(storage.getCid());
             serverExceptions.remove(storage.getCid());
@@ -997,7 +1006,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 plateW = pos.getW();
                 plateW = pos.getW();
                 plateH = pos.getH();
                 plateH = pos.getH();
             }
             }
-            statusBean.addPosInfo(outTask.getBarcode(), posName, plateW, plateH, false,outTask.isNgReel(),0);
+            statusBean.addPosInfo(outTask.getBarcode(), posName, plateW, plateH, false,outTask.isNgReel(),0,0);
             log.info("出库" + storage.getName() + "[" + posName + "]物料[" + outTask.getBarcode() + "]["+outTask.isNgReel()+"] 发送到客户端" + storage.getCid());
             log.info("出库" + storage.getName() + "[" + posName + "]物料[" + outTask.getBarcode() + "]["+outTask.isNgReel()+"] 发送到客户端" + storage.getCid());
         }
         }
         return statusBean;
         return statusBean;

src/main/java/com/neotel/smfcore/core/storage/service/po/StoragePos.java

@@ -122,6 +122,10 @@ public class StoragePos extends BasePo implements Serializable {
      */
      */
     private String remark;
     private String remark;
 
 
+    /**
+     * 最后一次分配库位号的料盘高度
+     */
+    private Integer lastReelH=0;
 
 
     public String getLabelStr(){
     public String getLabelStr(){
         String posNameLabel = posName;
         String posNameLabel = posName;