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 index 04ae68c..a0432ae 100644 --- 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 @@ -14,4 +14,7 @@ import java.util.List; public interface IMesOrgService { List queryMesOrg(MesOrg mesOrg); + + List queryMesOrgSplit(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 index f3fc87b..d1c09fc 100644 --- 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 @@ -39,4 +39,19 @@ public class MesOrgController { return ResultBean.fail(e); } } + + @GetMapping(value = "/query-split") + @ApiOperation(value = "查询责任人区域关系(拆分责任人)") + public ResultBean queryMesOrgSplit(MesOrg mesOrg) { + try { + List mesOrgList= mesOrgService.queryMesOrgSplit(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 index b43c8d9..1e9141d 100644 --- 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 @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @@ -39,4 +40,36 @@ public class MesOrgServiceImpl implements IMesOrgService { return mesOrgRDao.findByHqlWhere(packBean); } + + @Override + public List queryMesOrgSplit(MesOrg mesOrg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesOrg.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesOrg.getInventoryLocationCode(), "inventoryLocationCode", packBean); + if(StringUtil.isEmpty(mesOrg.getResponsibleParty())){ + DdlPreparedPack.getIsNotNull( "responsibleParty", packBean); + }else { + DdlPreparedPack.getStringEqualPack(mesOrg.getResponsibleParty(), "responsibleParty", packBean); + } + packBean.setOrderByStr(mesOrg.orderBy()); + List mesOrgList = mesOrgRDao.findByHqlWhere(packBean); + List resultList = new ArrayList<>(); + for (MesOrg org : mesOrgList) { + String responsibleParty = org.getResponsibleParty(); + if (StringUtil.isEmpty(responsibleParty)) { + resultList.add(org); + }else { + if (responsibleParty.contains(",")) { + String[] split = responsibleParty.split(","); + for (int i = 0; i < split.length; i++) { + org.setResponsibleParty(split[i]); + resultList.add(org); + } + }else { + resultList.add(org); + } + } + } + return resultList; + } + } 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 44c3142..e6e40e8 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 @@ -573,11 +573,11 @@ public class MesNcProcessingService implements IMesNcProcessingService { } //更新检验单 - DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); - DdlPreparedPack.getStringEqualPack(areaCode, "inventoryLocationCode", packBean); - MesOrg mesOrg = mesOrgRDao.getByProperty(packBean); +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); +// DdlPreparedPack.getStringEqualPack(areaCode, "inventoryLocationCode", packBean); +// MesOrg mesOrg = mesOrgRDao.getByProperty(packBean); //报废时设置责任人 - model.getPartInspection().setResponsibleParty(StringUtil.isEmpty(mesOrg)?areaCode:mesOrg.getResponsibleParty()); + model.getPartInspection().setResponsibleParty(model.getOnlyPerson()); model.getPartInspection().setDefectTypeId(person.getId()); model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue()); model.getPartInspection().setRejectQty(model.getPartInspection().getQty());