Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/MesNoSortCustSnNumberRuleStrategyService.java

@@ -9,13 +9,14 @@ import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
 /**
- * @Description : 非排序客户条码打印(武汉“通用”定制化开发)
+ * @Description : 非排序客户条码打印
  * @Reference :
  * @Author : junsheng.li
  * @CreateDate 2024/11/16 10:56
@@ -25,16 +26,16 @@ import java.util.Map;
 public class MesNoSortCustSnNumberRuleStrategyService implements INumberRulePackAttributeStrategyService {
 
     @Autowired
-    private IMesCustomerPartService mesCustomerPartService;
+    private IMesCustomerPartService customerPartService;
 
     @Autowired
-    private IMesCustomerSnTransformService mesCustomerSnTransformService;
+    private IMesCustomerSnTransformService customerSnTransformService;
 
     @Override
     public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
         Map<String, Object> dataMap = genSerialNoModel.getDataMap();
         MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ?
-                (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo());
+                (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : customerPartService.getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo());
         if (null != customerPart) {
             genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
         }else {
@@ -54,6 +55,8 @@ public class MesNoSortCustSnNumberRuleStrategyService implements INumberRulePack
 
     @Override
     public String transform(String serialNo) {
-        return mesCustomerSnTransformService.transformBarCodeGm(serialNo);
+        if (StringUtils.isEmpty(serialNo)) return serialNo;
+        return customerSnTransformService.transformBarCodeGm(serialNo);
     }
+
 }