去掉barcode的expTime ，过期时间使用 expireDate

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

@@ -36,8 +36,8 @@ public class BarcodeDto implements Serializable {
 
     private float maxStorageTime = 0;
 
-    @ApiModelProperty("过期时间（入库时间+最大存储时间）")
-    private Date expTime;
+//    @ApiModelProperty("过期时间（入库时间+最大存储时间）")
+//    private Date expTime;
 
     @ApiModelProperty("过期状态,-1未入库0在库,1已出库正常,2已出库且已过期")
     private int  status = BARCODE_STATUS.NEW;

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

@@ -42,10 +42,10 @@ public class Barcode extends BasePo implements Serializable {
     private int mixTime = 0;
 
     private float maxStorageTime = 0;
-    /**
-     * 过期时间（入库时间+最大存储时间）
-     */
-    private Date expTime;
+//    /**
+//     * 过期时间（入库时间+最大存储时间）
+//     */
+//    private Date expTime;
 
     /**
      * 过期状态,-1未入库0在库,1已出库正常,2已出库且已过期
@@ -287,7 +287,7 @@ public class Barcode extends BasePo implements Serializable {
         this.putInDate = new Date();
         status = BARCODE_STATUS.IN_STORE;
 
-        updateExpTime();
+//        updateExpTime();
 
     }
 
@@ -307,18 +307,18 @@ public class Barcode extends BasePo implements Serializable {
         this.putInDate = putInDate;
     }
 
-    private void updateExpTime() {
-        if (expTime == null && maxStorageTime != 0F && putInTime != -1) {
-            Float maxStorageTimeMill = maxStorageTime * 60 * 60 * 1000;
-            expTime = new Date(putInTime + maxStorageTimeMill.longValue());
-            if (expireDate != null) {
-                //如果是在包装上的过期时间之前,使用包装上的过期时间
-                if (expireDate.getTime() < expTime.getTime()) {
-                    expTime = expireDate;
-                }
-            }
-        }
-    }
+//    private void updateExpTime() {
+//        if (expTime == null && maxStorageTime != 0F && putInTime != -1) {
+//            Float maxStorageTimeMill = maxStorageTime * 60 * 60 * 1000;
+//            expTime = new Date(putInTime + maxStorageTimeMill.longValue());
+//            if (expireDate != null) {
+//                //如果是在包装上的过期时间之前,使用包装上的过期时间
+//                if (expireDate.getTime() < expTime.getTime()) {
+//                    expTime = expireDate;
+//                }
+//            }
+//        }
+//    }
 
     public void updateSluggishTime(int sluggishDay ){
         if(sluggishDay>0){
@@ -372,13 +372,13 @@ public class Barcode extends BasePo implements Serializable {
         this.checkOutDate = checkOutDate;
         this.outOpor = opor;
         if (checkOutDate != null) {//出库时判断是否过期
-            updateExpTime();
-            if (expTime != null && checkOutDate.after(expTime)) {
-                //过期时间小于出库时间,说明出库的时候已经过期了
-                status = BARCODE_STATUS.OUT_EXPIRED;
-            } else {
+//            updateExpTime();
+//            if (expTime != null && checkOutDate.after(expTime)) {
+//                //过期时间小于出库时间,说明出库的时候已经过期了
+//                status = BARCODE_STATUS.OUT_EXPIRED;
+//            } else {
                 status = BARCODE_STATUS.OUT_NORMAL;
-            }
+//            }
         }
     }
 

src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpController.java

@@ -120,7 +120,8 @@ public class MicronSpController {
             dto.setBarcode(pos.getBarcode().getBarcode());
             dto.setPartNumber(pos.getBarcode().getPartNumber());
             dto.setAmount(pos.getBarcode().getAmount());
-            dto.setExpTime(pos.getBarcode().getExpTime());
+            dto.setExpTime(pos.getBarcode().getExpireDate());
+            dto.setExpireDate(pos.getBarcode().getExpireDate());
         }
 
         return dto;

src/main/java/com/neotel/smfcore/custom/micron20031/bean/dto/PosInfoDto.java

@@ -22,4 +22,6 @@ public class PosInfoDto implements Serializable {
     private int amount;
     @ApiModelProperty("过期时间（入库时间+最大存储时间）")
     private Date expTime;
+    @ApiModelProperty("包装上带的过期时间")
+    private Date expireDate;
 }