From 68a2f24362052908ade08c4fa2d13a86a3a6fcad Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 29 May 2024 19:43:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E5=86=85=E7=9A=84=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesShiftService.java | 4 +++- .../controller/base/MesShiftController.java | 28 ++++++++++++++++++++++ .../serviceimpl/base/MesShiftService.java | 15 ++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java index 9499325..e1b4b90 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShiftService.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesShift; +import java.util.List; + /** * @Description: * @CreateDate 2024/04/16 @@ -9,5 +11,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShift; */ public interface IMesShiftService extends IBaseMesService { - + List findMesShift(MesShift mesShift); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java index ad1d546..ea8f476 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftController.java @@ -1,12 +1,40 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesShift; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShift") public class MesShiftController extends BaseMesController { + + @Autowired + private IMesShiftService mesShiftService; + + @GetMapping(value = "/find") + @ApiOperation(value = "查询班次信息", notes = "查询班次信息") + public ResultBean findMesShift(MesShift mesShift) { + try { + mesShift.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + List mesShiftList = mesShiftService.findMesShift(mesShift); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(mesShiftList); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java index 3fc9aa6..a9e548f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShiftService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesShiftService; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; @@ -11,6 +12,8 @@ import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesShiftService extends BaseMesService implements IMesShiftService { @@ -77,4 +80,16 @@ public class MesShiftService extends BaseMesService implements IMesShi } } + @Override + public List findMesShift(MesShift mesShift) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesShift.getOrganizeCode()); + String nowDate = TimeTool.getNowTime(true); + DdlPreparedPack.getNumEqualPack(mesShift.getIsValid(), "isValid", packBean); + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesShift.getShiftName(), "shiftName", packBean); + DdlPreparedPack.getStringSmallerPack(nowDate,"beginDate",packBean); + DdlPreparedPack.getStringBiggerPack(nowDate,"endDate",packBean); + return baseRDao.findByHqlWhere(packBean); + } } From 15de434e686aac13a38b1201e91709554a42891a Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 30 May 2024 09:29:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?41053=20MES=EF=BC=9A=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderService.java | 48 +++++++++++++++++----- .../ext/mes/pojo/constant/MesCommonConstant.java | 6 +-- 2 files changed, 39 insertions(+), 15 deletions(-) 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 33d9e9b..6f220fb 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService; import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.api.base.IMesProductOffLineService; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderService; @@ -61,6 +62,10 @@ public class MesWorkOrderService extends BaseMesService implements private MesShiftRepository mesShiftRDao; @Autowired private MesProductPlanRepository mesProductPlanRDao; + @Autowired + private IMesPartProdGroupService mesPartProdGroupService; + @Autowired + private MesCustomerPartRepository mesCustomerPartRDao; @Override public MesWorkOrder insert(MesWorkOrder bean) { @@ -84,15 +89,14 @@ public class MesWorkOrderService extends BaseMesService implements } //生成工单号 - genSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_JIS_SORT); - genSerialNoModel.setPartNo(bean.getPartNo()); + genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); BeanUtils.copyProperties(bean, copyMesWorkOrder); copyMesWorkOrder.setProduceSeq(produceSeq + 1); copyMesWorkOrder.setQty(1D); - copyMesWorkOrder.setWorkOrderNo(resultList.get(0) + "_" + copyMesWorkOrder.getOrganizeCode()); + copyMesWorkOrder.setWorkOrderNo(resultList.get(0)); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); MesWorkOrderLog workOrderLog = new MesWorkOrderLog(); @@ -105,24 +109,22 @@ public class MesWorkOrderService extends BaseMesService implements return bean; } else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()) { //生成工单号 - genSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_JIS_UN_SORT); + genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); } else { //生成工单号 - genSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO); + genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); Integer produceSeq = 0; if (null != result && result.getProduceSeq() != null) { produceSeq = result.getProduceSeq(); } bean.setProduceSeq(produceSeq + 1); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); - orderSeqSerialNoModel.setPartNo(bean.getPartNo()); List resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); bean.setWorkOrderSeq(resultList.get(0)); // bean.setOrderSeq(Integer.parseInt(resultList.get(0))); } - genSerialNoModel.setPartNo(bean.getPartNo()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); - bean.setWorkOrderNo(resultList.get(0) + "_" + bean.getOrganizeCode()); + bean.setWorkOrderNo(resultList.get(0)); bean.setQty(bean.getQty()); ConvertBean.serviceModelInitialize(bean, bean.getCreateUser()); @@ -327,8 +329,17 @@ public class MesWorkOrderService extends BaseMesService implements MesException.throwMesBusiException("vin号【%s】重复", item.getVinCode()); } } + //校验零件生产组信息 +// MesPartProdGroupDetail mesPartProdGroupDetail = new MesPartProdGroupDetail(); +// mesPartProdGroupDetail.setWorkCenterCode(item.getWorkCenterCode()); +// mesPartProdGroupDetail.setPartNo(item.getPartNo()); +// mesPartProdGroupDetail.setOrganizeCode(item.getOrganizeCode()); +// List mesPartProdGroup = mesPartProdGroupService.findMesPartProdGroup(mesPartProdGroupDetail); + + //排序工单数量为1 item.setQty(1d); + item.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()); } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()) { ValidatorBean.checkNotNull(item.getOrderFlag(), "标识不能为空"); ValidatorBean.checkNotNull(item.getProductVersion(), "生产版本不能为空"); @@ -345,9 +356,12 @@ public class MesWorkOrderService extends BaseMesService implements if (StringUtil.isEmpty(item.getPlanStartTime()) || StringUtil.isEmpty(item.getPlanEndTime())) { packPlanTime(item); } + if(StringUtil.isEmpty(item.getCustomerPartNo())){ + getCustomerPart(item); + } //校验物料生产版本是否存在 checkMesProductVersion(item, mesWorkCenter); - + item.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()); } else { ValidatorBean.checkNotNull(item.getPlanStartTime(), "计划开始时间不能为空"); ValidatorBean.checkNotNull(item.getPlanEndTime(), "计划结束时间不能为空"); @@ -356,16 +370,30 @@ public class MesWorkOrderService extends BaseMesService implements MesProductVersion mesProductVersion = getMesProductVersion(item, mesWorkCenter); item.setProductVersion(mesProductVersion.getProductVersion()); } + if(StringUtil.isEmpty(item.getCustomerPartNo())){ + getCustomerPart(item); + } //拼接 // item.setPlanStartTime(item.getPlanStartTime() + " " + "00:00:00"); // item.setPlanEndTime(item.getPlanEndTime() + " " + "23:59:59"); + item.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()); } //物料名称不存在，从物料信息中获取 MesPart mesPart = iMesPartService.getPartByPartNo(item.getPartNo(), item.getOrganizeCode()); item.setPartNameRdd(mesPart.getPartName()); item.setUnit(mesPart.getUnit()); - item.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()); + + } + + private void getCustomerPart(MesWorkOrder item) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getPartNo(), "erpPartNo", ddlPackBean); + MesCustomerPart customerPart = mesCustomerPartRDao.getByProperty(ddlPackBean); + if(!Objects.isNull(customerPart)){ + item.setCustomerPartNo(customerPart.getCustomerPartNo()); + item.setCustomerPartName(customerPart.getCustomerPartName()); + } } private void checkMesProductVersion(MesWorkOrder item, MesWorkCenter mesWorkCenter) { diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java index 15751c1..3479b9a 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java @@ -22,12 +22,8 @@ public class MesCommonConstant { */ //BTO工单顺序号 public static final String ORDER_NO_BTO_SEQ = "ORDER_NO_BTO_SEQ"; - //BTO单号规则 - public static final String ORDER_NO_BTO = "ORDER_NO_BTO"; - //非排序单号规则 - public static final String ORDER_NO_JIS_UN_SORT = "ORDER_NO_JIS_UN_SORT"; //排序单号规则 - public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT"; + public static final String MES_WORK_ORDER_NO = "MES_WORK_ORDER_NO"; //报工条码规则 public static final String REPORT_SN = "REPORT_SN"; //装车单号 From d654ac93f56b39f8fa8eaa0f9615e2931eea40f7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 May 2024 10:22:05 +0800 Subject: [PATCH 3/3] mes --- .../mes/api/base/IMesAssemblyNosortCfgService.java | 13 +++++++++++++ .../api/base/IMesAssemblyPartNosortCfgService.java | 14 -------------- ...oller.java => MesAssemblyNosortCfgController.java} | 7 +++---- .../serviceimpl/base/MesAssemblyNosortCfgService.java | 17 +++++++++++++++++ .../base/MesAssemblyPartNosortCfgService.java | 19 ------------------- .../base/MesCraftRouteDetailServiceImpl.java | 4 ++-- 6 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyPartNosortCfgService.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesAssemblyPartNosortCfgController.java => MesAssemblyNosortCfgController.java} (56%) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java delete mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyPartNosortCfgService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java new file mode 100644 index 0000000..87bafff --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author zxw + */ +public interface IMesAssemblyNosortCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyPartNosortCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyPartNosortCfgService.java deleted file mode 100644 index af32e9d..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyPartNosortCfgService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyPartNosortCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author zxw - */ -public interface IMesAssemblyPartNosortCfgService extends IBaseMesService { - - -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyPartNosortCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java similarity index 56% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyPartNosortCfgController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java index c49bc6a..9fe8d45 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyPartNosortCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java @@ -1,8 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyPartNosortCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleNosortCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +11,6 @@ import org.springframework.web.bind.annotation.RestController; */ @Api("非排序装配件维护表") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesAssemblyPartNosortCfg") -public class MesAssemblyPartNosortCfgController extends BaseMesController{ +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesAssemblyNosortCfg") +public class MesAssemblyNosortCfgController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java new file mode 100644 index 0000000..0da6561 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyNosortCfgService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesAssemblyNosortCfgService extends BaseMesService implements IMesAssemblyNosortCfgService { + + protected void setPackQueryBean(MesAssemblyNosortCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyPartNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyPartNosortCfgService.java deleted file mode 100644 index ed22582..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyPartNosortCfgService.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; - -import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyPartNosortCfgService; -import cn.estsh.i3plus.ext.mes.api.base.IMesTimeEfficientCfgService; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyPartNosortCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesTimeEfficientCfg; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class MesAssemblyPartNosortCfgService extends BaseMesService implements IMesAssemblyPartNosortCfgService { - - protected void setPackQueryBean(MesAssemblyPartNosortCfg bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPid(), "pid", packBean); - } -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCraftRouteDetailServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCraftRouteDetailServiceImpl.java index a9f0369..9acc7cb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCraftRouteDetailServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCraftRouteDetailServiceImpl.java @@ -149,7 +149,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService craftCodeList = findMesCraftCode(organizeCode, routeCode); //判断工艺是否属于同一流程 @@ -159,7 +159,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService