From b049a2097a9e6d9803ca0719b62dd841dd0b946d Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 13:28:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C-?= =?UTF-8?q?=E8=BD=AC=E6=AD=A3=E5=B8=B8=E4=B8=8D=E9=9C=80=E8=A6=81=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/base/IMesOrgService.java | 17 +++++++++ .../controller/busi/MesOrgController.java | 42 ++++++++++++++++++++++ .../serviceimpl/base/MesOrgServiceImpl.java | 42 ++++++++++++++++++++++ .../serviceimpl/busi/MesNcProcessingService.java | 26 ++++++++------ .../pcn/pojo/model/MesNcProcessingInputModel.java | 3 ++ 5 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesOrgService.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesOrgController.java create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrgServiceImpl.java diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesOrgService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesOrgService.java new file mode 100644 index 0000000..04ae68c --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesOrgService.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.ext.mes.pcn.api.base; + + +import cn.estsh.i3plus.pojo.mes.bean.MesOrg; + +import java.util.List; + +/** + * @Description: 责任人库区关系 + * @Author: gsz + * @Date: 2024/5/25 18:16 + * @Modify: + */ +public interface IMesOrgService { + + List queryMesOrg(MesOrg mesOrg); +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesOrgController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesOrgController.java new file mode 100644 index 0000000..f3fc87b --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesOrgController.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesOrgService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesOrg; +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.*; + +import java.util.List; + +/** + * @Description: 责任人库区关系 + * @Author: gsz + * @Date: 2024/6/5 10:16 + * @Modify: + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesOrg") +public class MesOrgController { + @Autowired + private IMesOrgService mesOrgService; + + + @GetMapping(value = "/query") + @ApiOperation(value = "查询责任人区域关系") + public ResultBean queryMesProdShiftRecord(MesOrg mesOrg) { + try { + + List mesOrgList= mesOrgService.queryMesOrg(mesOrg); + return ResultBean.success("查询成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(mesOrgList); + } catch (ImppBusiException e) { + return ResultBean.fail(e).build(); + } catch (Exception e) { + return ResultBean.fail(e); + } + } +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrgServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrgServiceImpl.java new file mode 100644 index 0000000..b43c8d9 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesOrgServiceImpl.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesOrgService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesOrg; +import cn.estsh.i3plus.pojo.mes.repository.MesOrgRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * @Description: 责任人区域关系 + * @Author: gsz + * @Date: 2024/6/5 10:16 + * @Modify: + */ +@Service +@Slf4j +public class MesOrgServiceImpl implements IMesOrgService { + + @Autowired + private MesOrgRepository mesOrgRDao; + + @Override + public List queryMesOrg(MesOrg bean) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(bean.getInventoryLocationCode(), "inventoryLocationCode", packBean); + if(StringUtil.isEmpty(bean.getResponsibleParty())){ + DdlPreparedPack.getIsNotNull( "responsibleParty", packBean); + }else { + DdlPreparedPack.getStringEqualPack(bean.getResponsibleParty(), "responsibleParty", packBean); + } + packBean.setOrderByStr(bean.orderBy()); + + return mesOrgRDao.findByHqlWhere(packBean); + } +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index 2039695..4004c66 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -165,14 +165,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { MesDefectType person = model.getPerson(); //保存数据 - saveDate(model, model.getPart(), type, person, org); + saveDate(model, model.getPart(), type, person, org,model.getAreaCode()); } else { Integer type = model.getType(); MesDefectType person = model.getPerson(); //保存数据 - saveDate(model, model.getPart(), type, person, org); + saveDate(model, model.getPart(), type, person, org,model.getAreaCode()); } } @@ -320,7 +320,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { * @param person * @param org */ - private void saveDate(MesNcProcessingInputModel model, MesPartSap part, Integer type, MesDefectType person, String org) { + private void saveDate(MesNcProcessingInputModel model, MesPartSap part, Integer type, MesDefectType person, String org,String areaCode) { if (type == MesExtEnumUtil.NC_TYPE.NORMAL.getValue()) { @@ -337,14 +337,15 @@ public class MesNcProcessingService implements IMesNcProcessingService { ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName()); partInspectionRepository.save(model.getPartInspection()); - //移库 转正常 - MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org); + //移库 转正常、放行：8000移至2000 areaCode=2000 + MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org); +// MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org); moveRepository.save(move); } else if (type == MesExtEnumUtil.NC_TYPE.REWORK.getValue()) { - //生成返工单 + //生成返工单 根据责任方库区对应关系，选择哪个责任方，就移动到哪个库区（8000移至8002/8003）； GenSerialNoModel serialNoModel = new GenSerialNoModel("NC_REWORK"); serialNoModel.setPartNo(part.getPartNo()); ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), org, 1); @@ -386,6 +387,9 @@ public class MesNcProcessingService implements IMesNcProcessingService { model.getPartInspection().setReworkTaskId(reworkTask.getId()); partInspectionRepository.save(model.getPartInspection()); + MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org); + moveRepository.save(move); + } else if (type == MesExtEnumUtil.NC_TYPE.SCRAP.getValue()) { //更新条码质量状态 @@ -401,8 +405,9 @@ public class MesNcProcessingService implements IMesNcProcessingService { ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName()); partInspectionRepository.save(model.getPartInspection()); - //移库 转报废 - MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "SCRAP"), org); + //移库 转报废 根据责任方库区对应关系的主数据，选择哪个责任方，就移动到哪个库区（8000移至8002/8003） + MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org); +// MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "SCRAP"), org); moveRepository.save(move); } else if (type == MesExtEnumUtil.NC_TYPE.RELEASE.getValue()) { @@ -421,8 +426,9 @@ public class MesNcProcessingService implements IMesNcProcessingService { partInspectionRepository.save(model.getPartInspection()); - //移库 转正常 - MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org); + //移库 转正常、放行：8000移至2000 areaCode=2000 + MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org); +// MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org); moveRepository.save(move); } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java index 86638d8..768958d 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java @@ -29,6 +29,9 @@ public class MesNcProcessingInputModel { @ApiParam("责任人") private MesDefectType person; + @ApiParam("区域代码") + private String areaCode; + @ApiParam("物料") private MesPartSap part;