1.出库通知客户端hseial修改

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

@@ -306,7 +306,7 @@ public class StatusBean {
         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) {
     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);
+        addPosInfo(barcode, posId, plateW, plateH, isSingleOut, isNgReel, "", usedCount,"");
     }
     }
     /**
     /**
      * 获取客户端发送上来的条码信息
      * 获取客户端发送上来的条码信息
@@ -317,7 +317,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,String ngMsg,int usedCount) {
+    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,String ngMsg,int usedCount,String hSerial) {
         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");
@@ -354,6 +354,7 @@ public class StatusBean {
             data.put("ngMsg", "Repeat Inbound");
             data.put("ngMsg", "Repeat Inbound");
         }
         }
         data.put("usedCount", usedCount + "");
         data.put("usedCount", usedCount + "");
+        data.put("hSerial",hSerial);
     }
     }
 
 
     /**
     /**

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

@@ -550,13 +550,12 @@ public class TaskService {
                         plateW = pos.getW();
                         plateW = pos.getW();
                         plateH = pos.getH();
                         plateH = pos.getH();
                     }
                     }
-                    statusBean.addData("hSerial",task.getSourceName());
                     String NgMsg=task.getAppendData("ngMsg");
                     String NgMsg=task.getAppendData("ngMsg");
                     boolean isNg=false;
                     boolean isNg=false;
                     if(ObjectUtil.isNotEmpty(NgMsg)){
                     if(ObjectUtil.isNotEmpty(NgMsg)){
                         isNg=true;
                         isNg=true;
                     }
                     }
-                    statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut,isNg,NgMsg,0);
+                    statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut,isNg,NgMsg,0,task.getSourceName());
                     log.info("出库" + storage.getName() + "[" + posName + "]物料[" + task.getBarcode() + "]" + isSingleOut + "["+NgMsg+"]发送到客户端" + cid);
                     log.info("出库" + storage.getName() + "[" + posName + "]物料[" + task.getBarcode() + "]" + isSingleOut + "["+NgMsg+"]发送到客户端" + cid);
                 }
                 }
             }
             }