From 960e4785362cb81b65b0a3761cb4b380f8ce692c Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 14 May 2024 15:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=85=94=E7=BB=84=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE(3=E4=B8=AA=E9=A1=B5=E9=9D=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesCavityGroupCfgService.java | 15 ++++++ .../api/base/IMesCavityGroupDetailCfgService.java | 15 ++++++ .../api/base/IMesEquipmentProdParamCfgService.java | 15 ++++++ .../mes/api/base/IMesModelMultiCavityService.java | 15 ++++++ .../base/MesCavityGroupCfgController.java | 18 ++++++++ .../base/MesCavityGroupDetailCfgController.java | 18 ++++++++ .../base/MesEquipmentProdParamCfgController.java | 18 ++++++++ .../base/MesModelMultiCavityController.java | 11 +++-- .../base/MesCavityGroupCfgServiceImpl.java | 53 ++++++++++++++++++++++ .../base/MesCavityGroupDetailCfgServiceImpl.java | 34 ++++++++++++++ .../base/MesEquipmentProdParamCfgServiceImpl.java | 34 ++++++++++++++ .../base/MesModelMultiCavityService.java | 12 ----- .../base/MesModelMultiCavityServiceImpl.java | 34 ++++++++++++++ .../serviceimpl/base/MesWorkOrderService.java | 5 +- .../i3plus/ext/mes/pojo/util/MesExtEnumUtil.java | 40 ++++++++++++++++ 15 files changed, 319 insertions(+), 18 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupCfgService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupDetailCfgService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentProdParamCfgService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesModelMultiCavityService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupDetailCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentProdParamCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupCfgServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupDetailCfgServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java delete mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupCfgService.java new file mode 100644 index 0000000..d0814b2 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupCfgService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg; + +/** + * @Description : 腔组维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:07 + * @Modify: + **/ +public interface IMesCavityGroupCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupDetailCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupDetailCfgService.java new file mode 100644 index 0000000..a4c5071 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesCavityGroupDetailCfgService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg; + +/** + * @Description : 腔组明细维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:07 + * @Modify: + **/ +public interface IMesCavityGroupDetailCfgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentProdParamCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentProdParamCfgService.java new file mode 100644 index 0000000..5ca665e --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentProdParamCfgService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg; + +/** + * @Description : 设备加工参数维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:07 + * @Modify: + **/ +public interface IMesEquipmentProdParamCfgService extends IBaseMesService{ + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesModelMultiCavityService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesModelMultiCavityService.java new file mode 100644 index 0000000..ecb411d --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesModelMultiCavityService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity; + +/** + * @Description : 一模多腔维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:07 + * @Modify: + **/ +public interface IMesModelMultiCavityService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupCfgController.java new file mode 100644 index 0000000..71b7023 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupCfgController.java @@ -0,0 +1,18 @@ +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.MesCavityGroupCfg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 腔组维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:32 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCavityGroupCfg") +public class MesCavityGroupCfgController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupDetailCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupDetailCfgController.java new file mode 100644 index 0000000..3bc975c --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCavityGroupDetailCfgController.java @@ -0,0 +1,18 @@ +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.MesCavityGroupDetailCfg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 腔组明细维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:32 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCavityGroupDetailCfg") +public class MesCavityGroupDetailCfgController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentProdParamCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentProdParamCfgController.java new file mode 100644 index 0000000..ff7a0ed --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentProdParamCfgController.java @@ -0,0 +1,18 @@ +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.MesEquipmentProdParamCfg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 设备加工参数维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:32 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentProdParamCfg") +public class MesEquipmentProdParamCfgController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java index a537078..05ac2bb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java @@ -1,15 +1,18 @@ 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.MesArea; import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 一模多腔维护 - */ + * @Description : 一模多腔维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:32 + * @Modify: + **/ @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesModelMultiCavity") -public class MesModelMultiCavityController extends BaseMesController{ +public class MesModelMultiCavityController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupCfgServiceImpl.java new file mode 100644 index 0000000..26ad779 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupCfgServiceImpl.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesCavityGroupCfgService; +import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 腔组维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:05 + * @Modify: + **/ +@Service +@Slf4j +public class MesCavityGroupCfgServiceImpl extends BaseMesService implements IMesCavityGroupCfgService { + + protected void setPackQueryBean(MesCavityGroupCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getCavityCode(), "cavityCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean); + } + + protected void onInsertBean(MesCavityGroupCfg item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getCavityCode(), "腔组代码不能为空"); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCavityCode(), "cavityCode", packBean); + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + MesException.throwMesBusiException("腔组代码【%s】已经存在，请检查数据", item.getCavityCode()); + } + } + + protected void onUpdateBean(MesCavityGroupCfg item) { + // 数据校验 + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCavityCode(), "cavityCode", packBean); + + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean); + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + MesException.throwMesBusiException("腔组代码【%s】已经存在，请检查数据", item.getCavityCode()); + } + } + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupDetailCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupDetailCfgServiceImpl.java new file mode 100644 index 0000000..55f9092 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCavityGroupDetailCfgServiceImpl.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesCavityGroupDetailCfgService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 腔组明细维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:05 + * @Modify: + **/ +@Service +@Slf4j +public class MesCavityGroupDetailCfgServiceImpl extends BaseMesService implements IMesCavityGroupDetailCfgService { + + protected void setPackQueryBean(MesCavityGroupDetailCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean); + DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean); + } + + + protected void onInsertBean(MesCavityGroupDetailCfg item) { + + } + + protected void onUpdateBean(MesCavityGroupDetailCfg item) { + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java new file mode 100644 index 0000000..945f14f --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentProdParamCfgService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 设备加工参数维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:05 + * @Modify: + **/ +@Service +@Slf4j +public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService implements IMesEquipmentProdParamCfgService { + + protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean); + DdlPreparedPack.getNumEqualPack(bean.getSeq(),"seq",packBean); + } + + + protected void onInsertBean(MesEquipmentProdParamCfg item) { + + } + + protected void onUpdateBean(MesEquipmentProdParamCfg item) { + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityService.java deleted file mode 100644 index bf655d4..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityService.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class MesModelMultiCavityService extends BaseMesService { - -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityServiceImpl.java new file mode 100644 index 0000000..34bd127 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityServiceImpl.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesModelMultiCavityService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +/** + * @Description : 一模多腔维护 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/14 14:29 + * @Modify: + **/ +@Service +@Slf4j +public class MesModelMultiCavityServiceImpl extends BaseMesService implements IMesModelMultiCavityService { + protected void setPackQueryBean(MesModelMultiCavity bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getModuleCode(),"moduleCode",packBean); + DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean); + DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean); + } + + + protected void onInsertBean(MesModelMultiCavity item) { + + } + + protected void onUpdateBean(MesModelMultiCavity item) { + } +} 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 7876553..8b9967f 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 @@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService implements BeanUtils.copyProperties(bean, copyMesWorkOrder); copyMesWorkOrder.setProduceSeq(produceSeq + 1); copyMesWorkOrder.setQty(1D); - copyMesWorkOrder.setOrderNo(resultList.get(0)); + copyMesWorkOrder.setOrderNo(resultList.get(0)+"_"+copyMesWorkOrder.getOrganizeCode()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); MesWorkOrderLog workOrderLog = new MesWorkOrderLog(); @@ -113,7 +113,7 @@ public class MesWorkOrderService extends BaseMesService implements } genSerialNoModel.setPartNo(bean.getPartNo()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); - bean.setOrderNo(resultList.get(0)); + bean.setOrderNo(resultList.get(0)+"_"+bean.getOrganizeCode()); bean.setQty(bean.getQty()); ConvertBean.serviceModelInitialize(bean, bean.getCreateUser()); @@ -208,6 +208,7 @@ public class MesWorkOrderService extends BaseMesService implements DdlPreparedPack.getStringSmallerPack(bean.getStartTimeEnd(), "planStartTime", packBean); DdlPreparedPack.getStringBiggerPack(bean.getEndTimeStart(), "planEndTime", packBean); DdlPreparedPack.getStringSmallerPack(bean.getEndTimeEnd(), "planEndTime", packBean); + packBean.setOrderByStr(" order by createDatetime desc "); } protected void onInsertBean(MesWorkOrder item) { diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java index 363d5be..3b4ad5f 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java @@ -1996,4 +1996,44 @@ public class MesExtEnumUtil { } } + /** + * 设备加工参数维护-数据来源 + */ + @JsonFormat( + shape = JsonFormat.Shape.OBJECT + ) + public static enum DATA_SOURCE { + DATA_SOURCE10(10, "排序加工规则"), + DATA_SOURCE20(20, "非排序加工规则"), + DATA_SOURCE30(30, "腔组明细的ID"); + + private int value; + private String description; + + private DATA_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + + for (int i = 0; i < values().length; ++i) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + + return tmp; + } + + public int getValue() { + return this.value; + } + + public String getDescription() { + return this.description; + } + } + }