单盘入库页面按最空位数排序

增加入库类型

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -147,6 +147,11 @@ public class Barcode extends BasePo implements Serializable {
     private Date putInDate;
     private Date putInDate;
 
 
     /**
     /**
+     * 入库类型：1=普通入库，2=并盘入库，3=截料入库，4=退料入库, 5=转储单入库
+     */
+    private int putInType;
+
+    /**
      * 入库操作人
      * 入库操作人
      */
      */
     private String inOpor;
     private String inOpor;

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

@@ -627,6 +627,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
         if (barcode != null) {
         if (barcode != null) {
             barcode.setUsedCount(barcode.getUsedCount() + 1);
             barcode.setUsedCount(barcode.getUsedCount() + 1);
             barcode.setPutInTime(System.currentTimeMillis());
             barcode.setPutInTime(System.currentTimeMillis());
+            barcode.setPutInType(task.getInType());
             barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber()));
             barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber()));
             barcode.setInOpor(task.getOperator());
             barcode.setInOpor(task.getOperator());
             barcode.setCheckOutDate(null, "");
             barcode.setCheckOutDate(null, "");

src/main/java/com/neotel/smfcore/core/hik/bean/ShelfPosInfo.java

@@ -36,7 +36,7 @@ public class ShelfPosInfo implements Serializable   ,Comparable<ShelfPosInfo> {
     @Override
     @Override
     public int compareTo(ShelfPosInfo o) {
     public int compareTo(ShelfPosInfo o) {
         if (this.getPosEmptySlots() != o.getPosEmptySlots()) {
         if (this.getPosEmptySlots() != o.getPosEmptySlots()) {
-            return this.posEmptySlots - o.getPosEmptySlots();
+            return o.getPosEmptySlots() - this.posEmptySlots;
         }
         }
         return this.getId().compareTo(o.getId());
         return this.getId().compareTo(o.getId());
     }
     }

src/main/java/com/neotel/smfcore/hikvision/HikApiCache.java

@@ -104,7 +104,7 @@ public class HikApiCache {
         int failed = 0;
         int failed = 0;
         for (HikApiRequestError apiRequest : failedList) {
         for (HikApiRequestError apiRequest : failedList) {
             int index = ok + failed;
             int index = ok + failed;
-            resendProcessMsg = "共["+total+"]个重发任务,已重发["+index+"]个,其中成功["+ok+"]个,NG["+failed+"]个";
+            resendProcessMsg = "共["+total+"]个重发任务,已重发["+index+"]个,成功["+ok+"]个,NG["+failed+"]个";
             ResponseParam responseParam = reSendRequest(apiRequest);
             ResponseParam responseParam = reSendRequest(apiRequest);
             if(responseParam != null && responseParam.getCode() == 0){
             if(responseParam != null && responseParam.getCode() == 0){
                 ok = ok + 1;
                 ok = ok + 1;
@@ -112,7 +112,7 @@ public class HikApiCache {
                 failed = failed + 1;
                 failed = failed + 1;
             }
             }
             index = index + 1;
             index = index + 1;
-            resendProcessMsg = "共["+total+"]个重发任务,已重发["+index+"]个,其中成功["+ok+"]个,NG["+failed+"]个";
+            resendProcessMsg = "共["+total+"]个重发任务,已重发["+index+"]个,成功["+ok+"]个,NG["+failed+"]个";
         }
         }
         resendProcessMsg = "";
         resendProcessMsg = "";
     }
     }