From 93677687643e20d9586e2b9a00ce63a947e1bb10 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 6 Nov 2024 16:55:47 +0800 Subject: [PATCH] =?UTF-8?q?43663=20=E8=AF=95=E5=88=B6=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=85=B3=E5=8D=95=EF=BC=88=E8=8A=9C?= =?UTF-8?q?=E6=B9=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java | 4 ++++ .../ext/mes/apiservice/serviceimpl/base/MesConfigService.java | 8 ++++++++ .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 8 ++++++++ .../java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java index 99f8fd1..7550fe6 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesConfig; import io.swagger.annotations.ApiOperation; import java.util.List; +import java.util.Objects; /** * @Description: @@ -39,4 +40,7 @@ public interface IMesConfigService { @ApiOperation(value = "更新配置") void update(MesConfig mesConfig,String userName); + @ApiOperation(value = "数据校验") + Boolean checkCfgValue(String organizeCode, String configCode, String value); + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesConfigService.java index 2e9a4f7..66a0499 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesConfigService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesConfig; import cn.estsh.i3plus.pojo.mes.repository.MesConfigRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -17,6 +18,7 @@ import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -106,4 +108,10 @@ public class MesConfigService implements IMesConfigService { configRepository.update(mesConfig); } + @Override + public Boolean checkCfgValue(String organizeCode, String configCode, String value) { + MesConfig config = getCfgValueByCode(organizeCode, configCode); + return !Objects.isNull(config) && !StringUtil.isEmpty(config.getCfgValue()) && !StringUtil.isEmpty(value) && config.getCfgValue().equals(value); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 27f1c22..eea22e0 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -47,6 +47,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; @Service @Slf4j @@ -168,6 +169,9 @@ public class MesWorkOrderService extends BaseMesService implements @Autowired private IMesProduceSnService mesProduceSnService; + @Autowired + private IMesConfigService mesConfigService; + @Override public MesWorkOrder insert(MesWorkOrder bean) { // 数据校验 @@ -1156,6 +1160,10 @@ public class MesWorkOrderService extends BaseMesService implements DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue(), "workOrderType", ddlPackBean); DdlPreparedPack.getStringSmallerNotEqualPack(TimeTool.getToday(), "planStartTime", ddlPackBean); + //非排序的试制工单(P单)不自动关单（芜湖） + if (mesConfigService.checkCfgValue(organizeCode, MesExtConstWords.CLOSE_P_WORK_ORDER, MesExtConstWords.ONE_STR)) { + DdlPreparedPack.getStringNoEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue(), "orderFlag", ddlPackBean); + } DdlPreparedPack.getNumberSmallerPack(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue(), "workOrderStatus", ddlPackBean); List mesWorkOrderList = baseRDao.findByHqlWhere(ddlPackBean); if(CollectionUtils.isEmpty(mesWorkOrderList)){ diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index f1a0805..f1db64d 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -222,6 +222,8 @@ public class MesExtConstWords { public static final String DATE_DD_01 = "-01"; //日期类型 public static final String DATE_DD_31 = "-31"; + // 1 + public static final String ONE_STR = "1"; //日期类型 public static final String DATE_SERIAL_FORMAT = "yyyyMMdd"; @@ -332,6 +334,8 @@ public class MesExtConstWords { */ //通用发运报表,发运组 public static final String GENERAL_SHIPPING_PART_GROUP = "GENERAL_SHIPPING_PART_GROUP"; + //非排序工单关闭是否关闭试制单 + public static final String CLOSE_P_WORK_ORDER = "CLOSE_P_WORK_ORDER"; }