1.通知迈征,pn用迈征发的

2.条码统一转成大写

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

@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 
 
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
+import java.util.Locale;
 
 
 /**
 /**
  *
  *
@@ -512,6 +513,9 @@ public class BarcodeRule {
             codeStr = arr[1];
             codeStr = arr[1];
 
 
         }
         }
+
+        codeStr = codeStr.toUpperCase(Locale.ROOT);
+
         codeBean.setCodeStr(codeStr);
         codeBean.setCodeStr(codeStr);
         if(!isValidRule()){
         if(!isValidRule()){
             codeBean.setError("smfcore.error.barcode.noRule","解析规则未定义");
             codeBean.setError("smfcore.error.barcode.noRule","解析规则未定义");

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengDeviceController.java

@@ -122,7 +122,7 @@ public class MaiZhengDeviceController {
             if (outDetailList != null && !outDetailList.isEmpty()){
             if (outDetailList != null && !outDetailList.isEmpty()){
                 for (ItemOutDetail detail : outDetailList) {
                 for (ItemOutDetail detail : outDetailList) {
                     Map<String, Object> map = new HashMap<>();
                     Map<String, Object> map = new HashMap<>();
-                    map.put("PARTNUMBER",detail.getPartNumber());
+                    map.put("PARTNUMBER",orderItem.getPn());
                     map.put("ReelNewLong",detail.getReelNewLong());
                     map.put("ReelNewLong",detail.getReelNewLong());
                     map.put("ReelNew",detail.getReelNew());
                     map.put("ReelNew",detail.getReelNew());
                     map.put("ReelOld",orderItem.getReel());
                     map.put("ReelOld",orderItem.getReel());