解决冲突

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintSortStepService.java

@@ -125,7 +125,7 @@ public class MesProductSnPrintSortStepService extends BaseStepService {
             // 根据工单号获取工单信息
             MesWorkOrder workOrder = workOrderMap.get(productionPartContext.getWorkOrderNo());
 
-            if (null == workOrder) stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号:{}无效!", productionPartContext.getWorkOrderNo()));
+            if (null == workOrder) stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]信息不存在!", productionPartContext.getWorkOrderNo()));
 
             if (CollectionUtils.isEmpty(partDataContext) || !partDataContext.containsKey(workOrder.getPartNo()))
                 stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]丢失零件信息缓存!", productionPartContext.getWorkOrderNo(), productionPartContext.getPartNo()));