diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java index a64c721..378465e 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java @@ -37,7 +37,8 @@ public interface IMesWorkOrderService extends IBaseMesService { @ApiOperation("ccscTest") List queryMesWorkOrderProcessToSap(String organizeCode); - MesWorkOrder getWorkOrder(String organizeCode, String workOrderNo); + @ApiOperation("查询工单信息") + MesWorkOrder getMesWorkOrder(String workOrderNo,String organizeCode); @ApiOperation("反向冲销") void doReportWorkReversal(WmsProductModel model); diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductionAssembly.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductionAssembly.groovy index 1f08b4d..98de858 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductionAssembly.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductionAssembly.groovy @@ -67,7 +67,9 @@ class MesToPiscesProductionAssembly { if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) { long id = Long.parseLong(String.valueOf(rowMap.get("production_record_id"))); if (Objects.isNull(mesProductionRecordMap) || !mesProductionRecordMap.containsKey(id)) { - mesProductionRecordMap.put(id, mesProductionRecordRepository.getById(id)) + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean) + mesProductionRecordMap.put(id, mesProductionRecordRepository.getByProperty(ddlPackBean)) } MesProductionRecord mesProductionRecord = mesProductionRecordMap.get(id) if (!Objects.isNull(mesProductionRecord)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesRawPartCharging.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesRawPartCharging.groovy index a7158af..1c8bb30 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesRawPartCharging.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesRawPartCharging.groovy @@ -1,3 +1,5 @@ +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack import cn.estsh.i3plus.pojo.mes.bean.MesRawPackage import cn.estsh.i3plus.pojo.mes.bean.MesRawPackageDetail import cn.estsh.i3plus.pojo.mes.bean.MesRawPackagePart @@ -37,12 +39,15 @@ class MesToPiscesRawPartCharging { Map mesRawPackageMap = new HashMap<>(); Map mesRawPackageDetailMap = new HashMap<>(); Map mesRawPackagePartMap = new HashMap<>(); + String organizeCode = mapper.getOrganizeCode(); for (Map rowMap : srcData) { //原材料容器 if (!StringUtils.isEmpty(rowMap.get("package_id"))) { long id = Long.parseLong(String.valueOf(rowMap.get("package_id"))); if (Objects.isNull(mesRawPackageMap) || !mesRawPackageMap.containsKey(id)) { - mesRawPackageMap.put(id, mesRawPackageRepository.getById(id)) + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean) + mesRawPackageMap.put(id, mesRawPackageRepository.getByProperty(ddlPackBean)) } MesRawPackage mesRawPackage = mesRawPackageMap.get(id) if (!Objects.isNull(mesRawPackage)) { @@ -59,7 +64,9 @@ class MesToPiscesRawPartCharging { if (!StringUtils.isEmpty(rowMap.get("package_detail_id"))) { long id = Long.parseLong(String.valueOf(rowMap.get("package_detail_id"))); if (Objects.isNull(mesRawPackageDetailMap) || !mesRawPackageDetailMap.containsKey(id)) { - mesRawPackageDetailMap.put(id, mesRawPackageDetailRepository.getById(id)) + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean) + mesRawPackageDetailMap.put(id, mesRawPackageDetailRepository.getByProperty(ddlPackBean)) } MesRawPackageDetail mesRawPackageDetail = mesRawPackageDetailMap.get(id) if (!Objects.isNull(mesRawPackageDetail)) { @@ -74,7 +81,9 @@ class MesToPiscesRawPartCharging { if (!StringUtils.isEmpty(rowMap.get("package_part_id"))) { long id = Long.parseLong(String.valueOf(rowMap.get("package_part_id"))); if (Objects.isNull(mesRawPackagePartMap) || !mesRawPackagePartMap.containsKey(id)) { - mesRawPackagePartMap.put(id, mesRawPackagePartRepository.getById(id)) + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean) + mesRawPackagePartMap.put(id, mesRawPackagePartRepository.getByProperty(ddlPackBean)) } MesRawPackagePart mesRawPackagePart = mesRawPackagePartMap.get(id) if (!Objects.isNull(mesRawPackagePart)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy index 9192253..db2f0c6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy @@ -57,7 +57,9 @@ class PiscesToMesWorkOrder { if (!StringUtils.isEmpty(rowMap.get("PRODUCT_GROUP_ID"))) { long id = Long.parseLong(String.valueOf(rowMap.get("PRODUCT_GROUP_ID"))) if (Objects.isNull(mesPartProdGroupMap) || !mesPartProdGroupMap.containsKey(id)) { - mesPartProdGroupMap.put(id, mesPartProdGroupRepository.getById(id)) + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean) + mesPartProdGroupMap.put(id, mesPartProdGroupRepository.getByProperty(ddlPackBean)) } MesPartProdGroup mesPartProdGroup = mesPartProdGroupMap.get(id) if (!Objects.isNull(mesPartProdGroup)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java index 5c24489..314bbe8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java @@ -198,8 +198,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " sd.plan_qty, " + " sd.actual_qty, " + " s.shipping_code, " + - " sd.part_no, " + - " sd.modify_date_time, " + + " sd.part_no " + " from mes_shipping_detail sd " + " left join mes_shipping s on s.id=sd.pid " + " WHERE sd.status in (20) " +//todo 发运 20 @@ -207,12 +206,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and sd.organize_code = :organizeCode "); hql.append(" and sd.is_deleted = :isDeleted "); hql.append(" and sd.is_valid = :isValid "); - if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ - hql.append(" and sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' "); - } - if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ - hql.append(" and sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' "); - } + if (!StringUtil.isEmpty(detail.getShippingCode())){ hql.append(" and s.shipping_code = '"+detail.getShippingCode()+"' "); } @@ -239,7 +233,6 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde model.setActualQty(StringUtils.isEmpty(cells[2]) ? 1 : Integer.parseInt(String.valueOf(cells[2]))); model.setShippingCode(StringUtils.isEmpty(cells[3]) ? "" : String.valueOf(cells[3])); model.setPartNo(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4])); - model.setModifyDatetime(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5])); modelList.add(model); } @@ -254,7 +247,12 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" WHERE wop.organize_code = :organizeCode "); hql.append(" and wop.is_deleted = :isDeleted "); hql.append(" and wop.is_valid = :isValid "); - + if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ + hql.append(" and wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' "); + } + if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ + hql.append(" and wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' "); + } if (!StringUtil.isEmpty(detail.getPartNo())){ hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } @@ -286,13 +284,19 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " wo.work_center_code, " + " wop.part_no, " + " wop.part_name, " + - " wop.item_qty " + + " wop.item_qty, " + + " wo.shipping_time " + " from mes_work_order_part wop " + " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " ); hql.append(" WHERE wop.organize_code = :organizeCode "); hql.append(" and wop.is_deleted = :isDeleted "); hql.append(" and wop.is_valid = :isValid "); - + if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ + hql.append(" and wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' "); + } + if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ + hql.append(" and wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' "); + } if (!StringUtil.isEmpty(detail.getPartNo())){ hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } @@ -320,6 +324,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde model.setPartNo(StringUtils.isEmpty(cells[1]) ? "" : String.valueOf(cells[1])); model.setPartName(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2])); model.setItemQty(StringUtils.isEmpty(cells[3]) ? 1 : Double.parseDouble(String.valueOf(cells[3]))); + model.setShippingTime(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4])); modelList.add(model); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesWorkOrderUpdateQtyJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesWorkOrderUpdateQtyJob.java index 8a0dc15..eff4af9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesWorkOrderUpdateQtyJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesWorkOrderUpdateQtyJob.java @@ -83,7 +83,7 @@ public class MesWorkOrderUpdateQtyJob extends BaseMesScheduleJob { Map> map = recordList.stream().collect(Collectors.groupingBy(MesProductionRecord::getWorkOrderNo)); List orders = new ArrayList<>(); map.forEach((k,v) -> { - MesWorkOrder workOrder = mesWorkOrderService.getWorkOrder(organizeCode, k); + MesWorkOrder workOrder = mesWorkOrderService.getMesWorkOrder(k,organizeCode); List productionRecords = getUnReportMesProduceSn(organizeCode, workOrder.getWorkOrderNo()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java index d124c48..8718c09 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -120,15 +121,16 @@ public abstract class BaseMesService implements IBaseMesServ public void deleteWeaklyById(Long id, String userName) { onDeleteId(id); //baseRDao.deleteWeaklyById(id, userName); - baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)}); + baseRDao.updateByProperties(new String[]{"organizeCode", "id"}, new Object[]{AuthUtilExt.getOrganizeCode(), id}, new String[]{"isDeleted", "modifyUser", "modifyDatetime"}, new Object[]{CommonEnumUtil.VALID, userName, TimeTool.getNowTime(true)}); } @Override public void deleteWeaklyByIds(Long[] ids, String userName) { + String organizeCode = AuthUtilExt.getOrganizeCode(); for (Long id : ids) { onDeleteId(id); //baseRDao.deleteWeaklyById(id, userName); - baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)}); + baseRDao.updateByProperties(new String[]{"organizeCode", "id"}, new Object[]{organizeCode, id}, new String[]{"isDeleted", "modifyUser", "modifyDatetime"}, new Object[]{CommonEnumUtil.VALID, userName, TimeTool.getNowTime(true)}); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java index 1e29e2e..9f08f5c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerOriganzeService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; +import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @author yinxiao @@ -77,7 +80,12 @@ public class MesCustomerOriganzeService extends BaseMesService implements I } protected void onDeleteId(Long id) { - MesCustomer mesCustomer = baseRDao.getById(id); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean); + MesCustomer mesCustomer = baseRDao.getByProperty(ddlPackBean); + if(Objects.isNull(mesCustomer)){ + MesException.throwMesBusiException("ID【%s】客户信息不存在",id); + } //校验客户物料是否存在 DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java index ea283ff..3b6f0b2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -15,7 +17,6 @@ import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; import cn.estsh.i3plus.pojo.mes.repository.MesLoadingListDetailRepository; -import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository; import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -36,28 +37,24 @@ import java.util.Objects; @Slf4j public class MesLoadingListService extends BaseMesService implements IMesLoadingListService { - @Autowired private MesLoadingListDetailService detailService; - - @Autowired - private MesPartShippingGroupRepository partShippingGroupRepository; @Autowired private MesShippingOrderManagementRepository shippingOrderManagementRepository; @Autowired private MesLoadingListDetailRepository listDetailRepository; - + @Autowired + private IMesPartShippingGroupService mesPartShippingGroupService; @Autowired private ISyncFuncService syncFuncService; - @Override public MesLoadingList insert(MesLoadingList bean) { //插入前构造并校验数据 onInsertBean(bean); MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0); - MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getById(shippingOrderManagement.getPartShippingGroupId()); + MesPartShippingGroup partShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(shippingOrderManagement.getOrganizeCode(),shippingOrderManagement.getShippingGroupCode()); if (StringUtils.isEmpty(partShippingGroup)) { throw ImppExceptionBuilder.newInstance() @@ -156,9 +153,11 @@ public class MesLoadingListService extends BaseMesService implem @Override public void deleteWeaklyByIds(Long[] ids, String userName) { - + String organizeCode = AuthUtilExt.getOrganizeCode(); for (Long id : ids) { - MesLoadingList bean = baseRDao.getById(id); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(id,"id",packBean); + MesLoadingList bean = baseRDao.getByProperty(packBean); if (StringUtils.isEmpty(bean)) continue; DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(bean.getId(), "pid", detailPackBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java index cbd0104..f48e606 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java @@ -134,7 +134,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService im ValidatorBean.checkNotNull(item.getWorkCellCode(), "工作单元代码不能为空"); ValidatorBean.checkNotNull(item.getWorkCenterCode(), "工作中心代码不能为空"); //校验数据是否存在 - MesWcEquipment mesWcEquipmentDb = baseRDao.getById(item.getId()); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(item.getId(),"id",ddlPackBean); + MesWcEquipment mesWcEquipmentDb = baseRDao.getByProperty(ddlPackBean); if (null == mesWcEquipmentDb || CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesWcEquipmentDb.getIsDeleted()) { MesException.throwMesBusiException("数据不存在"); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java index acb91af..554dcbd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java @@ -439,7 +439,9 @@ public class MesWorkOrderCutService extends BaseMesService impl public void doUpdatePrintStatus(List cutWorkOrderIds, String organizeCode, String userName) { for (String cutWorkOrderId : cutWorkOrderIds) { - workOrderCutRepository.updateByProperties(MesExtConstWords.ID, Long.parseLong(cutWorkOrderId), + workOrderCutRepository.updateByProperties( + new String[]{MesExtConstWords.ID, MesExtConstWords.ORGANIZE_CODE}, + new Object[]{Long.parseLong(cutWorkOrderId), organizeCode}, new String[]{MesExtConstWords.IS_DELETED, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME, MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.PRINT_STATUS}, new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true), CommonEnumUtil.FALSE, MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue()}); } 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 10f5183..2bccc32 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 @@ -198,7 +198,7 @@ public class MesWorkOrderService extends BaseMesService implements @Override public MesWorkOrder update(MesWorkOrder bean) { - MesWorkOrder result = baseRDao.getById(bean.getId()); + MesWorkOrder result = getMesWorkOrder(bean.getWorkOrderNo(),bean.getOrganizeCode()); //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 if (result.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { if (!Objects.equals(bean.getQty(), result.getQty())) { @@ -1364,7 +1364,7 @@ public class MesWorkOrderService extends BaseMesService implements return mesWorkOrderList; } - private MesWorkOrder getMesWorkOrder(String workOrderNo, String organizeCode) { + public MesWorkOrder getMesWorkOrder(String workOrderNo, String organizeCode) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean); MesWorkOrder mesWorkOrder = baseRDao.getByProperty(packBean); @@ -1572,15 +1572,6 @@ public class MesWorkOrderService extends BaseMesService implements return mesWorkOrderRDao.findByHqlWhere(packBean); } - @Override - public MesWorkOrder getWorkOrder(String organizeCode, String workOrderNo) { -// statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()); - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); - - DdlPreparedPack.getStringEqualPack(workOrderNo, "workOrderNo", packBean); - return mesWorkOrderRDao.getByProperty(packBean); - } - private MesMove createMove(MesPartSap mesPart, String source, String target, String org, String workCenterCode, double qty, String sn, Integer moveType) { MesMove move = new MesMove(); if (!Objects.isNull(mesPart)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/file/MesModuleExcelServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/file/MesModuleExcelServiceImpl.java index 8568d9d..9ce908d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/file/MesModuleExcelServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/file/MesModuleExcelServiceImpl.java @@ -70,7 +70,9 @@ public class MesModuleExcelServiceImpl extends BaseMesService im @Override public void updateModuleExcel(MultipartFile file, MesModuleExcel mesModuleExcel) { - MesModuleExcel moduleExcelManageDb = baseRDao.getById(mesModuleExcel.getId()); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesModuleExcel.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(mesModuleExcel.getId(),"id",ddlPackBean); + MesModuleExcel moduleExcelManageDb = baseRDao.getByProperty(ddlPackBean); if (moduleExcelManageDb == null) { MesException.throwMesBusiException("ID【%s】记录不存在", mesModuleExcel.getId()); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 810defc..9a5280c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentSpotCheckService; import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderPartService; import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderResultService; import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud; @@ -190,7 +191,9 @@ public class MesSpotCheckOrderService extends BaseMesService public MesSpotCheckOrder update(MesSpotCheckOrder bean) { onUpdateBean(bean); //获取点检单 - MesSpotCheckOrder originBean = baseRDao.getById(bean.getId()); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(bean.getId(), "id", ddlPackBean); + MesSpotCheckOrder originBean = baseRDao.getByProperty(ddlPackBean); if (StringUtils.isEmpty(originBean)) { throw ImppExceptionBuilder.newInstance() @@ -318,9 +321,11 @@ public class MesSpotCheckOrderService extends BaseMesService @Override public void deleteWeaklyByIds(Long[] ids, String userName) { - + String organizeCode = AuthUtilExt.getOrganizeCode(); for (Long id : ids) { - MesSpotCheckOrder bean = baseRDao.getById(id); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(id, "id", ddlPackBean); + MesSpotCheckOrder bean = baseRDao.getByProperty(ddlPackBean); if (StringUtils.isEmpty(bean)) continue; if (bean.getStatus() == MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()) {