过期时间根据mes返回 设置

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -671,7 +671,7 @@ public class BarcodeRule {
             }
             b.setDateCode(dateCode);
             //设置生产日期
-            ExpiredSetting setting = ExpireDateUtil.getExpiredSetting(dateCode, supplier, partNumber);
+            /*ExpiredSetting setting = ExpireDateUtil.getExpiredSetting(dateCode, supplier, partNumber);
             if (setting != null) {
                 try {
                     produceDate = cn.hutool.core.date.DateUtil.parse(dateCode, setting.getExpFormat());
@@ -681,7 +681,7 @@ public class BarcodeRule {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
+            }*/
 
         }
 

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

@@ -425,6 +425,8 @@ public class NLShelfHandler extends BaseDeviceHandler {
             throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码",new String[]{code});
         }
 
+        barcode = lizhenApi.getInDate(barcode);
+
         //校验是否可以入库
         Map<String, Object> brandQty = lizhenApi.brandQty(barcode.getPartNumber(), barcode.getProvider());
         if (brandQty == null || brandQty.isEmpty()) {

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -213,6 +213,11 @@ public class DeviceController {
                         barcode = barcodeCanPutIn;
                     }
 
+                    Barcode barcodeDate = lizhenApi.getInDate(barcode);
+                    if (barcodeDate != null){
+                        barcode = barcodeDate;
+                    }
+
                     Barcode barcodeApi = lizhenApi.barcodeInfo(barcode);
 
                     //如果是L开头的去量测

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -590,6 +590,15 @@ public class LiteOrderCache {
                                 excludePosIds.add(pos.getId());
                                 pos = null;
                             }
+
+                            try {
+                                 lizhenApi.getInDate(pos.getBarcode());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                log.error(pos.getBarcode().getBarcode() + "：" + e.getMessage());
+                                excludePosIds.add(pos.getId());
+                                pos = null;
+                            }
                         } while (pos == null);
                     }
                     if (pos == null) {

src/main/java/com/neotel/smfcore/custom/lizhen/LizhenApi.java

 package com.neotel.smfcore.custom.lizhen;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -67,6 +69,9 @@ public class LizhenApi extends DefaultSmfApiListener {
     @Value("${api.checkReelMeasure}")
     private String checkReelMeasureUrl = "";
 
+    @Value("${api.getInDateUrl}")
+    private String getInDateUrl = "";
+
     @PostConstruct
     public void init(){
         fetchGRUrl = dataCache.getConfigCache("fetchGRUrl",fetchGRUrl);
@@ -77,6 +82,7 @@ public class LizhenApi extends DefaultSmfApiListener {
         outNotifyUrlPK = dataCache.getConfigCache("api.outNotifyUrlPK",outNotifyUrlPK);
         batchCheckUrl = dataCache.getConfigCache("api.batchCheckUrl",batchCheckUrl);
         checkReelMeasureUrl = dataCache.getConfigCache("api.checkReelMeasure",checkReelMeasureUrl);
+        getInDateUrl = dataCache.getConfigCache("api.getInDate",getInDateUrl);
     }
 
     /**
@@ -590,6 +596,43 @@ public class LizhenApi extends DefaultSmfApiListener {
     }
 
 
+    public Barcode getInDate(Barcode barcode) {
+        if (StringUtils.isBlank(getInDateUrl)) {
+            return barcode;
+        }
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("material_code", barcode.getPartNumber());
+        paramMap.put("date_code", barcode.getDateCode());
+        paramMap.put("plant_code", plant);
+        paramMap.put("brand", barcode.getProvider());
+        try {
+            log.info(barcode.getBarcode() + ":getInDate入参为:" + JSON.toJSONString(paramMap));
+            String result = HttpHelper.postJson(getInDateUrl, paramMap);
+            log.info(barcode.getBarcode() + ":getInDate出参为:" + result);
+            JSONObject jsonObject = JSON.parseObject(result);
+            String msgty = jsonObject.getString("MSGTY");
+            if ("S".equalsIgnoreCase(msgty)) {
+                int data = jsonObject.getIntValue("DATA");
+                if (data < 0) {
+                    throw new ValidateException("smfcore.error.barcode.expired", "物料已过期,无法入库");
+                }
+                else if (data > 0){
+                    Date expireDate = DateUtil.offsetDay(new Date(), data);
+                    barcode.setExpireDate(expireDate);
+                }  else {
+                    barcode.setExpireDate(null);
+                }
+                return barcode;
+            } else {
+                throw new ValidateException("smfcore.mesApi.getInDate.ng", barcode.getBarcode() + "验证ng:" + jsonObject.getString("MSGTX"));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ValidateException("smfcore.mesApi.getInDate.ng", barcode.getBarcode() + "验证ng:" + e.getMessage());
+        }
+    }
+
+
     @Override
     public boolean isForThisApi(String apiName) {
         return apiName != null && apiName.equalsIgnoreCase("Lizhen");

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java

@@ -221,6 +221,15 @@ public class OutLineController {
                 }
             }
 
+            try {
+                Barcode barcodeDate = lizhenApi.getInDate(barcode);
+                if (barcodeDate != null){
+                    barcode = barcodeDate;
+                }
+            } catch (Exception e) {
+                return ResultBean.newErrorResult(-1,"",e.getMessage());
+            }
+
 
             //判断物料是否过期
             Date expireDate = barcode.getExpireDate();

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/WarehouseController.java

@@ -1136,6 +1136,13 @@ public class WarehouseController {
                     e.printStackTrace();
                     return ResultBean.newErrorResult(-1, "", e.getMessage());
                 }
+
+                try {
+                    lizhenApi.getInDate(codeBean.getBarcode());
+                } catch (Exception e) {
+                    return ResultBean.newErrorResult(-1, "", e.getMessage());
+                }
+
                 List<Barcode> subCodes = pidBarcode.getSubCodeList();
                 if (subCodes == null || subCodes.isEmpty()) {
                     return ResultBean.newErrorResult(-1, "", "料箱:" + boxStr + "，没有可出库的物料");

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -26,6 +26,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.custom.lizhen.LizhenApi;
 import com.neotel.smfcore.custom.lizhen.innerBox.bean.OutLotInfo;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
 import com.neotel.smfcore.custom.lizhen.innerBox.util.OutLotInfoCache;
@@ -88,6 +89,9 @@ public class InnerBoxRestController {
     @Autowired
     private SmfApi smfApi;
 
+    @Autowired
+    private LizhenApi lizhenApi;
+
     //料架缓存id
     private static Map<String,String> labelOrderItemMap = new ConcurrentHashMap<>();
 
@@ -524,6 +528,15 @@ public class InnerBoxRestController {
             return ResultBean.newErrorResult(-1, "", e.getMessage());
         }
 
+        try {
+            Barcode barcodeDate = lizhenApi.getInDate(barcode);
+            if (barcodeDate != null){
+                barcode = barcodeDate;
+            }
+        } catch (Exception e) {
+            return ResultBean.newErrorResult(-1,"",e.getMessage());
+        }
+
         //不在仓中,不允许出库
         StoragePos storagePos = storagePosManager.getByBarcode(barcode.getBarcode());
         if (storagePos == null){

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/VirtualRestController.java

@@ -163,6 +163,16 @@ public class VirtualRestController {
             return ResultBean.newErrorResult(-1,"",e.getMessage());
         }
 
+        try {
+            Barcode barcodeDate = lizhenApi.getInDate(barcode);
+            if (barcodeDate != null){
+                barcode = barcodeDate;
+            }
+        } catch (Exception e) {
+            return ResultBean.newErrorResult(-1,"",e.getMessage());
+        }
+
+
         //判断是否已经存在库位
         StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
         if (pos != null) {
@@ -350,7 +360,7 @@ public class VirtualRestController {
                     barcode.setAmount(dataLog.getNum());
                     barcode.setDateCode(dataLog.getDateCode());
                     //设置生产日期
-                    ExpiredSetting setting = ExpireDateUtil.getExpiredSetting(dataLog.getDateCode(), dataLog.getProvider(),dataLog.getPartNumber());
+                   /* ExpiredSetting setting = ExpireDateUtil.getExpiredSetting(dataLog.getDateCode(), dataLog.getProvider(),dataLog.getPartNumber());
                     if (setting != null) {
                         try {
                             Date produceDate = cn.hutool.core.date.DateUtil.parse(dataLog.getDateCode(), setting.getExpFormat());
@@ -360,7 +370,7 @@ public class VirtualRestController {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-                    }
+                    }*/
                     barcode.setPartNumber(dataLog.getPartNumber());
                     barcode.setBatch(dataLog.getBatchInfo());
                     barcode.setProvider(dataLog.getProvider());

src/main/resources/config/application.yml

@@ -14,6 +14,7 @@ api:
   brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数
   importUrl: #http://172.30.150.83:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据
   checkReelMeasure: #http://172.30.60.117:8001/Sct/CheckReelMeasure #外仓散料仓量测接口
+  getInDateUrl: http://172.30.170.199:8082/api/Mes/GetInDate
   plant: W337
   werks: W337
   outerFactory: B15