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

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -57,7 +58,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // 总成零件号
         resultMap.put(MesExtConstWords.PART_NO, workOrder.getPartNo());
         // 工单标识
-        resultMap.put(MesExtConstWords.ORDER_FLAG, workOrder.getOrderFlag());
+        resultMap.put(MesExtConstWords.ORDER_FLAG, workOrder.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.PTR.getValue()) ? MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue() : workOrder.getOrderFlag());
         // 客户订单号
         resultMap.put(MesExtConstWords.CUST_ORDER_NO, workOrder.getCustOrderNo());
         // 客户零件号