From 624c581f54f015594e60cece235b0f4fc163f20c Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 6 Feb 2023 11:24:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=98=E9=A1=B9=E7=9B=AE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foreverwin/mesnac/common/dto/SfcDispatchDto.java  | 2 ++
 .../dispatch/service/impl/SfcDispatchServiceImpl.java     | 8 ++++++++
 2 files changed, 10 insertions(+)

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<SfcDispatchMapper, SfcDi
                     message.append("派工单[" + dispatchNo + "]不存在，请确认数据是导出的原始数据");
                     continue;
                 }
+
+                //save项目号
+                if (StringUtil.notBlank(sfcDispatchDto.getItemNumber())){
+                    SpringUtil.getBean(CustomFieldsService.class).setCustom(HandleEnum.SHOP_ORDER.getHandle(site,sfcDispatchDto.getShopOrder()), CustomFieldConstant.SO_ITEM_NUMBER,sfcDispatchDto.getItemNumber());;
+                }
+
                 resourceType = sfcDispatchModel.getResourceType();
                 String status = sfcDispatchModel.getDispatchStatus();