merge uat-temp-wj-2412270000-44628 解决冲突

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java

@@ -59,7 +59,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // vinCode
         resultMap.put(MesExtConstWords.VIN_CODE, workOrder.getVinCode());
         // vinCode 后四位
-        resultMap.put(MesExtConstWords.VIN_CODE_AFTER_FOUR, workOrder.getVinCode());
+        resultMap.put(MesExtConstWords.VIN_CODE_AFTER_FOUR, !StringUtils.isEmpty(workOrder.getVinCode()) && workOrder.getVinCode().length() > MesExtConstWords.FOUR ? workOrder.getVinCode().substring(workOrder.getVinCode().length() - MesExtConstWords.FOUR) : workOrder.getVinCode());
         // 总成零件号
         resultMap.put(MesExtConstWords.PART_NO, workOrder.getPartNo());
         // 工单标识

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java

@@ -247,6 +247,8 @@ public class MesExtConstWords {
     public static final int ONE = 1;
     //"1"
     public static final String ONE_STR = "1";
+    //4
+    public static final Integer FOUR = 4;
     // 10
     public static final Integer TEN = 10;
     //""