diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java index e87f2a5..a4edaf8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java @@ -492,7 +492,7 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService { Integer workOrderType = workOrderPageVo.getWorkOrderType(); String workOrderTypeName = MesPcnExtEnumUtil.WORK_ORDER_TYPE.valueOfDescription(workOrderType); workOrderPageVo.setWorkOrderTypeName(workOrderTypeName); - + workOrderPageVo.setSnCreateStatusName((StringUtils.isEmpty(workOrderPageVo.getSnCreateStatus()) || workOrderPageVo.getSnCreateStatus() != MesPcnExtEnumUtil.WORK_ORDER_SN_CREATE_STATUS.CREATED.getValue()) ? "未生成" : "已生成"); workOrderPageVo.setWorkCenterName(!StringUtils.isEmpty(workOrderPageVo.getWorkCenterCode()) ? workCenterCodeMap.get(workOrderPageVo.getWorkCenterCode()) : null); //mes生产工单页面按钮控制 workOrderPageVo.setMesButtonFlagModel(this.getMesButtonFlagModel(workOrderPageVo)); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java index ca65ccf..39d4fdd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java @@ -785,6 +785,9 @@ public class ProduceSnExtService implements IProduceSnExtService { .setErrorDetail("工单[%s]批量生成包装条码时没有返回包装条码集合,操作失败", workOrder.getOrderNo()) .build(); } + + workOrderExtService.saveSnCreateStatus(workOrder, userInfo, MesPcnExtEnumUtil.WORK_ORDER_SN_CREATE_STATUS.CREATED.getValue()); + if (operateType == 1) return workOrderAutoCreateSnService.insertPackage(resultBean.getResultList(), workOrder, partDb, codeType.getCodeType(), prodPackDb, num, userInfo); else return workOrderAutoCreateSnService.insertSealedPackage(resultBean.getResultList(), workOrder, partDb, codeType.getCodeType(), prodPackDb, num, userInfo); @@ -795,6 +798,7 @@ public class ProduceSnExtService implements IProduceSnExtService { .setErrorDetail("工单[%s]批量生成包装条码失败", workOrder.getOrderNo()) .build(); } + } @Override diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/WorkOrderPageVo.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/WorkOrderPageVo.java index 149f3d2..54be424 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/WorkOrderPageVo.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/WorkOrderPageVo.java @@ -65,6 +65,12 @@ public class WorkOrderPageVo implements Serializable { @ApiParam("工单类型") private String workOrderTypeName; + @ApiParam("条码生成状态") + private Integer snCreateStatus; + + @ApiParam("条码生成状态") + private String snCreateStatusName; + @ApiParam("计划开始时间") private String startTime;