查找出库界面增加首次入库时间显示

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -11,6 +11,8 @@ import lombok.Setter;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Transient;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -220,4 +222,12 @@ public class BarcodeDto implements Serializable {
      * 料箱中的物料信息
      * 料箱中的物料信息
      */
      */
     private Map<String, BarcodeDto> subCodeMap;
     private Map<String, BarcodeDto> subCodeMap;
+
+    public String getPutInTimeStr() {
+        if (putInTime == -1) {
+            return null;
+        }
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
+        return   dateFormat.format( new Date(putInTime));
+    }
 }
 }

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

@@ -139,7 +139,7 @@ public class Barcode extends BasePo implements Serializable {
     private long startWarmTime = -1;
     private long startWarmTime = -1;
 
 
     /**
     /**
-     * 入库时间
+     * 最后一次 入库时间
      */
      */
     private Date putInDate;
     private Date putInDate;
 
 
@@ -246,9 +246,9 @@ public class Barcode extends BasePo implements Serializable {
     public void setPutInTime(long putInTime) {
     public void setPutInTime(long putInTime) {
         if (this.putInTime == -1) {
         if (this.putInTime == -1) {
             this.putInTime = putInTime;
             this.putInTime = putInTime;
-            this.putInDate = new Date(putInTime);
         }
         }
 
 
+        this.putInDate = new Date(putInTime);
         status = BARCODE_STATUS.IN_STORE;
         status = BARCODE_STATUS.IN_STORE;
 
 
         updateExpTime();
         updateExpTime();

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

@@ -61,7 +61,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
     private IHumitureManager humitureManager;
     private IHumitureManager humitureManager;
     
     
     @Autowired
     @Autowired
-    private IBarcodeManager barcodeManager;
+    protected IBarcodeManager barcodeManager;
 
 
     @Autowired
     @Autowired
     protected TaskService taskService;
     protected TaskService taskService;

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

@@ -143,6 +143,10 @@ public class SensorShelfHandler extends BaseDeviceHandler {
             dataLog.setBarcode(reelId);
             dataLog.setBarcode(reelId);
             dataLog.setPartNumber(pn);
             dataLog.setPartNumber(pn);
             dataLog.setType(OP.PUT_IN);
             dataLog.setType(OP.PUT_IN);
+
+            barcode.setPutInTime(System.currentTimeMillis());
+            barcodeManager.saveBarcode(barcode);
+
             dataLog.setNum(barcode.getAmount());
             dataLog.setNum(barcode.getAmount());
             dataLog.setStatus(OP_STATUS.WAIT.name());
             dataLog.setStatus(OP_STATUS.WAIT.name());
             dataLog.setGroupId(groupId);
             dataLog.setGroupId(groupId);

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

@@ -82,6 +82,10 @@ public class TaskService {
         task.setType(OP.PUT_IN);
         task.setType(OP.PUT_IN);
         task.setStatus(OP_STATUS.EXECUTING.name());
         task.setStatus(OP_STATUS.EXECUTING.name());
 
 
+        if(barcode!=null){
+            barcode.setPutInTime(System.currentTimeMillis());
+            barcodeManager.saveBarcode(barcode);
+        }
         String loginUser = SecurityUtils.getLoginUsername();
         String loginUser = SecurityUtils.getLoginUsername();
         task.setOperator(loginUser);
         task.setOperator(loginUser);
         task = updateQueueTask(task);
         task = updateQueueTask(task);