realRfid也保存再datalog中

src/main/java/com/neotel/smfcore/core/shelf/TaskShelfUtil.java

@@ -27,6 +27,9 @@ public class TaskShelfUtil {
      */
      */
     public static Map<String, Map<String, ShelfInfo>> taskShelfMap =null;
     public static Map<String, Map<String, ShelfInfo>> taskShelfMap =null;
 
 
+    /**料架所在的产线位置
+     *
+     */
     public static Map<String,String> shelfLocMap=null;
     public static Map<String,String> shelfLocMap=null;
 
 
     private static String HSERIAL_SHELF_MAP_KEY = "HSERIAL_SHELF_MAP_KEY";
     private static String HSERIAL_SHELF_MAP_KEY = "HSERIAL_SHELF_MAP_KEY";

src/main/java/com/neotel/smfcore/core/shelf/rest/TaskShelfController.java

@@ -177,6 +177,7 @@ public class TaskShelfController {
             boolean result = TaskShelfUtil.putInShelf(opTask, rfid, rfidLoc);
             boolean result = TaskShelfUtil.putInShelf(opTask, rfid, rfidLoc);
             if(result){
             if(result){
                 //更改任务完成
                 //更改任务完成
+                opTask.setRealRfid(rfid);
                 opTask.setStatus(OP_STATUS.FINISHED.name());
                 opTask.setStatus(OP_STATUS.FINISHED.name());
                 taskService.removeQueueTask(opTask);
                 taskService.removeQueueTask(opTask);
                 taskService.updateFinishedTask(opTask);
                 taskService.updateFinishedTask(opTask);

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -273,7 +273,7 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog>
     }
     }
 
 
     /**
     /**
-     * 获取自定义附加信息  工单料架信息： tempRfid, rfidLoc
+     * 获取自定义附加信息  工单料架信息： tempRfid, rfidLoc ，realRfid
      * @param appendKey
      * @param appendKey
      * @param <T>
      * @param <T>
      * @return
      * @return
@@ -286,18 +286,25 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog>
         return null;
         return null;
     }
     }
 
 
+    public void setRealRfid(String realRfid) {
+        updateAppendData("realRfid", realRfid);
+    }
+
+    public String getRealRfid(){
+        return getAppendData("realRfid");
+    }
 
 
     public void setTempRfid(String tempRfid) {
     public void setTempRfid(String tempRfid) {
         updateAppendData("tempRfid", tempRfid);
         updateAppendData("tempRfid", tempRfid);
     }
     }
-    public void setRfidLoc(int rfidLoc) {
-        updateAppendData("rfidLoc", rfidLoc);
-    }
 
 
     public String getTempRfid(){
     public String getTempRfid(){
         return getAppendData("tempRfid");
         return getAppendData("tempRfid");
     }
     }
 
 
+    public void setRfidLoc(int rfidLoc) {
+        updateAppendData("rfidLoc", rfidLoc);
+    }
     public Integer getRfidLoc(){
     public Integer getRfidLoc(){
         return getAppendData("rfidLoc");
         return getAppendData("rfidLoc");
     }
     }