From 3ddc47997f43918df6732963adae2e86e0a9ae92 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 17 Sep 2025 10:54:21 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=90=8C=E6=AD=A5=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=BF=9B=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/os/common/constant/MesConstants.java |  5 +++++
 .../os/mes/api/service/impl/ERPPortServiceImpl.java    |  1 +
 .../prod/service/impl/ProdPlanErpInfoServiceImpl.java  | 10 ++++++++--
 .../resources/mapper/mes/prod/ProdPlanInfoMapper.xml   |  9 +++++----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/os-common/src/main/java/com/os/common/constant/MesConstants.java b/os-common/src/main/java/com/os/common/constant/MesConstants.java
index c639343..1219236 100644
--- a/os-common/src/main/java/com/os/common/constant/MesConstants.java
+++ b/os-common/src/main/java/com/os/common/constant/MesConstants.java
@@ -44,6 +44,11 @@ public class MesConstants
      */
     public static final String MES_IS_ERP_YES = "1";
 
+    /**
+     * 导入类型（0=人工，1=ERP）
+     */
+    public static final String MES_IMPORT_TYPE_ERP = "1";
+
     /**
      * 生成工资标识（0未生成 1已生成）
      */
diff --git a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java
index 4c22c65..492588b 100644
--- a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java
+++ b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java
@@ -310,6 +310,7 @@ public class ERPPortServiceImpl implements IERPPortService {
         ProdPlanInfo prodPlanInfo = new ProdPlanInfo();
         prodPlanInfo.setPlanStatus(MesConstants.MES_PLAN_STATUS_FINISH);
         prodPlanInfo.setUploadFlag(MesConstants.MES_IS_ERP_NO);
+        prodPlanInfo.setImportFlag(MesConstants.MES_IMPORT_TYPE_ERP);
         List<ProdPlanInfo> planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo);
         logger.info("获取到{}条已完成的计划信息", planInfoList.size());
         return planInfoList;
diff --git a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java
index ba6713f..df5890b 100644
--- a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java
+++ b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java
@@ -132,8 +132,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
                 prodPlanInfo.setPlanCode(seqNo);
                 List<ProdPlanInfo> planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo);
                 ProdPlanInfo planInfo = planInfoList.get(0);
-                if (planInfo.getUploadFlag().equals(MesConstants.MES_IS_ERP_YES) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_FINISH)
-                        || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_IN) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_DELETE)) {
+                if (planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_FINISH)){
+                    ProdPlanErpInfo erpInfo = new ProdPlanErpInfo();
+                    erpInfo.setObjId(infoList.get(0).getObjId());
+                    erpInfo.setTaskProgress(planErpInfo.getTaskProgress());
+                    this.updateProdPlanErpInfo(erpInfo);
+                }
+                if (planInfo.getUploadFlag().equals(MesConstants.MES_IS_ERP_YES)  || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_IN)
+                        || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_DELETE)) {
                     continue;
                 }
                 planInfo.setPlanCode(seqNo);
diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml
index 578f440..0061f8d 100644
--- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml
+++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml
@@ -149,10 +149,11 @@
             <if test="updatedTime != null ">and ppi.updated_time = #{updatedTime}</if>
             <if test="planBeginTime != null ">and ppi.plan_begin_time = #{planBeginTime}</if>
             <if test="planEndTime != null ">and ppi.plan_end_time = #{planEndTime}</if>
-            <if test="planStatus != null  and planStatus != ''">and plan_status = #{planStatus}</if>
-            <if test="classes != null  and classes != ''">and classes = #{classes}</if>
-            <if test="processCode != null  and processCode != ''">and process_code = #{processCode}</if>
-            <if test="uploadFlag != null  and uploadFlag != ''">and upload_flag = #{uploadFlag}</if>
+            <if test="planStatus != null  and planStatus != ''">and ppi.plan_status = #{planStatus}</if>
+            <if test="classes != null  and classes != ''">and ppi.classes = #{classes}</if>
+            <if test="processCode != null  and processCode != ''">and ppi.process_code = #{processCode}</if>
+            <if test="uploadFlag != null  and uploadFlag != ''">and ppi.upload_flag = #{uploadFlag}</if>
+            <if test="importFlag != null  and importFlag != ''">and ppi.import_flag = #{importFlag}</if>
         </where>
     </select>