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