diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java index 00606a59..c68a772a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java @@ -138,6 +138,15 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe List outSourceProcessSheetProductDTOList = outSourceProcessSheetProductMapper.toDto(outSourceProcessSheetProductList); outSourceProcessSheetDTO.setOutSourceProcessSheetProductList(outSourceProcessSheetProductDTOList); } + + String procStatus = outSourceProcessSheetDTO.getProcStatus(); + ProcStatusEnum procStatusEnum = ProcStatusEnum.getProcStatusEnum(procStatus); + if(null == procStatusEnum){ + procStatusEnum = ProcStatusEnum.OUT_SOURCE_ING; + } + if(null != procStatusEnum){ + outSourceProcessSheetDTO.setProcStatusName(procStatusEnum.getName()); + } } } } diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java index fccc5e06..5221e50c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java @@ -9,7 +9,9 @@ public enum ProcStatusEnum { SENDING_GOOD("发货中", "SENDING_GOOD"), COMPLETED("已完结", "COMPLETED"), - OUT_SOURCE_ING("委外中", "OUT_SOURCE_ING") + OUT_SOURCE_ING("委外中", "OUT_SOURCE_ING"), + OUT_SOURCE_INSPECTION_ING("委外验收中", "OUT_SOURCE_INSPECTION_ING"), + OUT_SOURCE_INSPECTIONED("委外验收结束", "OUT_SOURCE_INSPECTIONED") ; private String name;