sapItem修改

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

@@ -166,7 +166,18 @@ public class CodeResolve {
                 }catch (Exception ex){
                 }catch (Exception ex){
                     log.error("条码["+codeStr+"]重置过期时间出错："+ ex.getMessage());
                     log.error("条码["+codeStr+"]重置过期时间出错："+ ex.getMessage());
                 }
                 }
-
+                try{
+                    if((codeBeanFromRule.getBarcode()!=null)&&(codeBeanFromRule.getBarcode().getP20Item()!=null)) {
+                        String P20 = codeBeanFromRule.getBarcode().getP20Item();
+                        if (barcode.getP20Item()==null||(!barcode.getP20Item().equals(P20)) ){
+                            log.warn("[" + barcode.getBarcode() + "]重新设置P20ITEM [" +P20 + "]");
+                            barcode.setP20Item(P20);
+                            barcode = barcodeManager.save(barcode);
+                        }
+                    }
+                }catch (Exception ex){
+                    log.error("条码["+codeStr+"]重置 P20 出错："+ ex.getMessage());
+                }
                 try{
                 try{
                     if((codeBeanFromRule.getBarcode()!=null) ) {
                     if((codeBeanFromRule.getBarcode()!=null) ) {
                         boolean needSave = false;
                         boolean needSave = false;

src/main/java/com/neotel/smfcore/custom/micron1053/api/AMaterialBean.java

@@ -37,9 +37,9 @@ public class AMaterialBean {
 
 
         bean.serialNum = barcode.getBarcode();
         bean.serialNum = barcode.getBarcode();
         bean.partNumber = barcode.getPartNumber();
         bean.partNumber = barcode.getPartNumber();
-        bean.sapItem = false;
+        bean.sapItem = true;
         if(ObjectUtil.isNotEmpty(barcode.getP20Item())){
         if(ObjectUtil.isNotEmpty(barcode.getP20Item())){
-            bean.sapItem=true;
+            bean.sapItem=false;
         }
         }
         bean.mfgPartNum = barcode.getMpn();
         bean.mfgPartNum = barcode.getMpn();
         bean.mfgLotNum = barcode.getMbatch();
         bean.mfgLotNum = barcode.getMbatch();