1.bug修改

2.出库展示优化

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

@@ -686,7 +686,7 @@ public class Micron20031Api {
         }
         }
         String auth = getAuthToken();
         String auth = getAuthToken();
         Map<String,String> dataMap = new HashMap<>();
         Map<String,String> dataMap = new HashMap<>();
-        dataMap.put("MicronLotID",micronLotId);
+        dataMap.put("MicronLotID",micronLotId.toUpperCase());
         dataMap.put("EquipID",equipId);
         dataMap.put("EquipID",equipId);
         dataMap.put("MaterialType", MATERIAL_TYPE);
         dataMap.put("MaterialType", MATERIAL_TYPE);
 
 

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

@@ -66,7 +66,7 @@ public class MicronSpApiListener extends BaseSmfApiListener {
             //普通入库验证 调用return
             //普通入库验证 调用return
             try {
             try {
                 log.info("canPutInAfterResolve 普通入库验证 调用return");
                 log.info("canPutInAfterResolve 普通入库验证 调用return");
-                Barcode resultBarcode = Micron20031Api.returnMaterial(barcode, Micron20031Api.MODE_ENABLE_MAM_SAP, params.getLoginUser());
+                Barcode resultBarcode = Micron20031Api.returnMaterial(barcode, Micron20031Api.NORMAL_RETURN, params.getLoginUser());
                 if (resultBarcode != null) {
                 if (resultBarcode != null) {
                     return resultBarcode;
                     return resultBarcode;
                 }
                 }

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

@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.micron20031;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.custom.micron20031.bean.dto.PosInfoDto;
 import com.neotel.smfcore.custom.micron20031.bean.dto.PosInfoDto;
@@ -51,12 +52,19 @@ public class MicronSpController {
             Integer num = Convert.toInt(posName.substring(2, posName.length()));
             Integer num = Convert.toInt(posName.substring(2, posName.length()));
 
 
             Integer used = 0;
             Integer used = 0;
-            if (pos.isUsed()&&pos.getBarcode()!=null) {
+            Barcode barcode = pos.getBarcode();
+            if (pos.isUsed()&&barcode!=null) {
                 used = 1;
                 used = 1;
                 Boolean AuthoriseNg= pos.getBarcode().getAppendData("AuthoriseNg") ;
                 Boolean AuthoriseNg= pos.getBarcode().getAppendData("AuthoriseNg") ;
                 if(AuthoriseNg!=null && AuthoriseNg){
                 if(AuthoriseNg!=null && AuthoriseNg){
                     used=2;
                     used=2;
                 }
                 }
+                Date expireDate = barcode.getExpireDate();
+                if (expireDate != null){
+                    if (System.currentTimeMillis() - expireDate.getTime() > 0){
+                        used = 3;
+                    }
+                }
             }
             }
 //             used=1;
 //             used=1;
 
 
@@ -120,7 +128,8 @@ public class MicronSpController {
             dto.setBarcode(pos.getBarcode().getBarcode());
             dto.setBarcode(pos.getBarcode().getBarcode());
             dto.setPartNumber(pos.getBarcode().getPartNumber());
             dto.setPartNumber(pos.getBarcode().getPartNumber());
             dto.setAmount(pos.getBarcode().getAmount());
             dto.setAmount(pos.getBarcode().getAmount());
-            dto.setExpTime(pos.getBarcode().getExpTime());
+            dto.setExpTime(pos.getBarcode().getExpireDateStr());
+            dto.setNgReason(pos.getBarcode().getAppendData("AuthoriseNgReason"));
         }
         }
 
 
         return dto;
         return dto;

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

@@ -105,6 +105,7 @@ public class MicronSpUnloadController {
 
 
                     Barcode barcode = pos.getBarcode();
                     Barcode barcode = pos.getBarcode();
                     barcode.updateAppendData("AuthoriseNg", false);
                     barcode.updateAppendData("AuthoriseNg", false);
+                    barcode.updateAppendData("AuthoriseNgReason","");
                     pos.setBarcode(barcode);
                     pos.setBarcode(barcode);
                     storagePosManager.save(pos);
                     storagePosManager.save(pos);
 
 
@@ -116,6 +117,7 @@ public class MicronSpUnloadController {
 
 
                     Barcode barcode = pos.getBarcode();
                     Barcode barcode = pos.getBarcode();
                     barcode.updateAppendData("AuthoriseNg", true);
                     barcode.updateAppendData("AuthoriseNg", true);
+                    barcode.updateAppendData("AuthoriseNgReason",ex.toString());
                     pos.setBarcode(barcode);
                     pos.setBarcode(barcode);
                     storagePosManager.save(pos);
                     storagePosManager.save(pos);
                     log.info("unload/getMicronPN [" + pn + "] barcode [" + pos.getBarcode().getBarcode() + "] 标记为NG");
                     log.info("unload/getMicronPN [" + pn + "] barcode [" + pos.getBarcode().getBarcode() + "] 标记为NG");

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

@@ -21,5 +21,7 @@ public class PosInfoDto implements Serializable {
     @ApiModelProperty("数量")
     @ApiModelProperty("数量")
     private int amount;
     private int amount;
     @ApiModelProperty("过期时间（入库时间+最大存储时间）")
     @ApiModelProperty("过期时间（入库时间+最大存储时间）")
-    private Date expTime;
+    private String expTime;
+    @ApiModelProperty("ng原因")
+    private String ngReason;
 }
 }