From 4476558b8568ecef07d29fc6aa02aaf659cda846 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 17 Jun 2025 17:40:37 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=9F=E4=BA=A7=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0ERP=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=BC=A0ERP?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/os/common/constant/MesConstants.java | 10 +++++++++ .../com/os/mes/prod/domain/ProdPlanInfo.java | 11 ++++++++++ .../prod/service/IProdPlanInfoService.java | 7 +++++++ .../service/impl/ProdPlanInfoServiceImpl.java | 21 +++++++++++++++++++ .../mapper/mes/prod/ProdPlanInfoMapper.xml | 7 +++++++ 5 files changed, 56 insertions(+) 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 1446e8a..43d0809 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 @@ -54,4 +54,14 @@ public class MesConstants */ public static final String MES_IS_SALARY_YES = "1"; + + /** + * 工单状态（0未开始 1执行中 2执行完成 3取消 4待执行） + */ + public static final String MES_PLAN_STATUS_NOT = "0"; + public static final String MES_PLAN_STATUS_IN = "1"; + public static final String MES_PLAN_STATUS_FINISH = "2"; + public static final String MES_PLAN_STATUS_CANCEL = "3"; + public static final String MES_PLAN_STATUS_WAIT = "4"; + } diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java index 803b787..26b379b 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java @@ -165,8 +165,19 @@ public class ProdPlanInfo extends BaseEntity { /** 导入类型（0=人工，1=ERP） */ private String importFlag; + /** 上传ERP类型（0=未上传，1=已上传） */ + private String uploadFlag; + private List prodPlanDetailList; + public String getUploadFlag() { + return uploadFlag; + } + + public void setUploadFlag(String uploadFlag) { + this.uploadFlag = uploadFlag; + } + public String getImportFlag() { return importFlag; } diff --git a/os-mes/src/main/java/com/os/mes/prod/service/IProdPlanInfoService.java b/os-mes/src/main/java/com/os/mes/prod/service/IProdPlanInfoService.java index b903f11..67ad576 100644 --- a/os-mes/src/main/java/com/os/mes/prod/service/IProdPlanInfoService.java +++ b/os-mes/src/main/java/com/os/mes/prod/service/IProdPlanInfoService.java @@ -65,4 +65,11 @@ public interface IProdPlanInfoService { * @return */ int orderAddProdPlanInfoList(List prodPlanInfos); + + /** + * 更新上传ERP状态 + * @param planCode + * @return + */ + int updateProdPlanInfoUploadFlag(String planCode); } diff --git a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanInfoServiceImpl.java b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanInfoServiceImpl.java index b4856f3..d55b135 100644 --- a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanInfoServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.os.mes.prod.service.impl; import java.util.List; +import com.os.common.constant.MesConstants; import com.os.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -104,4 +105,24 @@ public class ProdPlanInfoServiceImpl implements IProdPlanInfoService { } return 1; } + + /** + * 更新上传ERP状态 + * @param planCode + * @return + */ + @Override + public int updateProdPlanInfoUploadFlag(String planCode) { + ProdPlanInfo prodPlanInfo = new ProdPlanInfo(); + prodPlanInfo.setPlanCode(planCode); + List planInfoList = prodPlanInfoMapper.selectProdPlanInfoList(prodPlanInfo); + if (planInfoList != null && !planInfoList.isEmpty()) { + ProdPlanInfo planInfo = planInfoList.get(0); + planInfo.setUploadFlag(MesConstants.MES_IS_ERP_YES); + planInfo.setUpdatedTime(DateUtils.getNowDate()); + prodPlanInfoMapper.updateProdPlanInfo(planInfo); + } + return 1; + } + } 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 4adbbb7..578f440 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml @@ -30,6 +30,7 @@ + @@ -72,6 +73,7 @@ ppi.plan_end_time, ppi.plan_status, ppi.process_code, + ppi.upload_flag, ppi.import_flag from prod_plan_info ppi left join base_product_line bpl on bpl.product_line_code = ppi.station_code @@ -102,6 +104,7 @@ ppi.plan_end_time, ppi.plan_status, ppi.classes, + ppi.upload_flag, ppi.process_code, ppd.obj_id d_obj_id, ppd.plan_code d_plan_code, @@ -149,6 +152,7 @@ and plan_status = #{planStatus} and classes = #{classes} and process_code = #{processCode} + and upload_flag = #{uploadFlag} @@ -182,6 +186,7 @@ classes, process_code, import_flag, + upload_flag, #{planCode}, @@ -206,6 +211,7 @@ #{classes}, #{processCode}, #{importFlag}, + #{uploadFlag}, @@ -234,6 +240,7 @@ classes = #{classes}, process_code = #{processCode}, import_flag = #{importFlag}, + upload_flag = #{uploadFlag}, where obj_id = #{objId}