解析条码时更新条码的过期时间

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -119,7 +119,21 @@ public class CodeResolve {
                 }catch (Exception ex){
                 }catch (Exception ex){
                     log.error("条码["+codeStr+"]重置MPN出错："+ ex.getMessage());
                     log.error("条码["+codeStr+"]重置MPN出错："+ ex.getMessage());
                 }
                 }
-
+                try{
+                    if((codeBeanFromRule.getBarcode()!=null)&&(codeBeanFromRule.getBarcode().getExpireDate()!=null)) {
+                        if (barcode.getExpireDate()==null||barcode.getExpireDate().before(codeBeanFromRule.getBarcode().getExpireDate())) {
+                            try {
+                                log.warn("[" + barcode.getBarcode() + "]重新设置过期时间[" + barcode.getExpireDate() + "]为[" + codeBeanFromRule.getBarcode().getExpireDate() + "]");
+                                barcode.setExpireDate(codeBeanFromRule.getBarcode().getExpireDate());
+                                barcode = barcodeManager.save(barcode);
+                            } catch (Exception ve) {
+                                log.error("重新设置过期时间出错", ve);
+                            }
+                        }
+                    }
+                }catch (Exception ex){
+                    log.error("条码["+codeStr+"]重置过期时间出错："+ ex.getMessage());
+                }
                 boolean setSize=false;
                 boolean setSize=false;
                 Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(),barcode.getProvider());
                 Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(),barcode.getProvider());
                 int validDay = 0;
                 int validDay = 0;