diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index ca3cf654..fb98eb44 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -186,10 +186,12 @@ public class SfcDispatchDto implements Serializable{ /** * 工单自定义字段-工作令号 */ + @ExcelColumn("工作令号") private String workOrder; /** * 工单自定义字段-项目号 */ + @ExcelColumn("项目号") private String itemNumber; /**实际时间**/ diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index f499e540..65f40c28 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.common.constant.Constants; +import com.foreverwin.mesnac.common.constant.CustomFieldConstant; import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant; import com.foreverwin.mesnac.common.dto.SfcDispatchDDto; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; @@ -31,6 +32,7 @@ import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.SpringUtil; import org.apache.commons.fileupload.FileItem; import org.slf4j.Logger; @@ -469,6 +471,12 @@ public class SfcDispatchServiceImpl extends ServiceImpl