diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectAlarmConfigService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectAlarmConfigService.java index d09a3aa..2fbc3c4 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectAlarmConfigService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectAlarmConfigService.java @@ -1,13 +1,13 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesDefectAlarmConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig; /** * @Description: * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesDefectAlarmConfigService extends IBaseMesService { +public interface IMesDefectAlarmConfigService extends IBaseMesService { public void saveDefectAlarmConfigByJob(String org); diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectService.java deleted file mode 100644 index f347ef1..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesDefect; - -/** - * @Description: - * @CreateDate 2024/04/16 - * @Author mingliang.li - */ -public interface IMesDefectService extends IBaseMesService { - - -} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectTypeService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectTypeService.java new file mode 100644 index 0000000..5f0444b --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectTypeService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesDefectTypeService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesItemPartErrorPreventionService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesItemPartErrorPreventionService.java index ade96d1..84d8a7b 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesItemPartErrorPreventionService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesItemPartErrorPreventionService.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesDefectAlarmConfig; import cn.estsh.i3plus.pojo.mes.bean.MesItemPartErrorPrevention; /** diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java index b4c96bc..704737b 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementDetailService.java @@ -1,7 +1,12 @@ package cn.estsh.i3plus.ext.mes.api.base; +import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; +import java.util.List; + /** * @Description: * @CreateDate 2024/04/16 @@ -10,4 +15,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; public interface IMesShippingOrderManagementDetailService extends IBaseMesService { + public ListPager queryDetailGroupByPartNo(MesShippingOrderManagementDetail bean, Pager pager); + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectTypeController.java similarity index 75% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectTypeController.java index 3649a92..32b841c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectTypeController.java @@ -1,7 +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.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,5 +12,5 @@ import org.springframework.web.bind.annotation.RestController; @Api("缺陷类型") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDefect") -public class MesDefectController extends BaseMesController { +public class MesDefectTypeController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectAlarmConfigController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectWarnConfigController.java similarity index 55% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectAlarmConfigController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectWarnConfigController.java index ea00d85..c62b01e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectAlarmConfigController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectWarnConfigController.java @@ -1,15 +1,14 @@ 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.MesDefectAlarmConfig; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(description = "缺陷告警配置") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDefectAlarmConfig") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDefectWarnConfig") -public class MesDefectAlarmConfigController extends BaseMesController{ +public class MesDefectWarnConfigController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesItemPartErrorPreventionController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesItemPartErrorPreventionController.java index 4b2c75e..71facc5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesItemPartErrorPreventionController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesItemPartErrorPreventionController.java @@ -1,7 +1,6 @@ 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.MesDefectAlarmConfig; import cn.estsh.i3plus.pojo.mes.bean.MesItemPartErrorPrevention; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java index cb380ac..ecf3e42 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java @@ -1,9 +1,18 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,5 +20,24 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShippingOrderManagementDetail") -public class MesShippingOrderManagementDetailController extends BaseMesController{ +public class MesShippingOrderManagementDetailController extends BaseMesController { + + @Autowired + private IMesShippingOrderManagementDetailService shippingOrderManagementDetailService; + + @PostMapping(value = "/query-group") + @ApiOperation(value = "发运单管理明细-根据零件汇总") + public ResultBean insertMesProdOrg(MesShippingOrderManagementDetail detail, Pager pager) { + try { + + detail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(shippingOrderManagementDetailService.queryDetailGroupByPartNo(detail,pager)); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesShippingOrderManagementDetailDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesShippingOrderManagementDetailDao.java new file mode 100644 index 0000000..5577ffc --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesShippingOrderManagementDetailDao.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.ext.mes.apiservice.dao; + +import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; + +import java.util.List; + +/** + * @Description : SAP生产计划 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/7 15:13 + * @Modify: + **/ +public interface IMesShippingOrderManagementDetailDao { + + int queryOrderDetailGroupByPartCount(MesShippingOrderManagementDetail detail); + + List queryOrderDetailGroupByPartInfo(MesShippingOrderManagementDetail detail, Pager pager); +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java index 3d732e4..135be94 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java @@ -31,7 +31,7 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { @Override public List queryMesDefectRecordGroupBy(String organizeCode, Integer count, String createDateTimeStart, String createDateTimeEnd) { - StringBuffer hql = new StringBuffer("select mdr.part_no ,mp.part_type_code mdr.sides ,mdr.defect_location_code ,mdr.defect_code "); + StringBuffer hql = new StringBuffer("select mdr.part_no ,mp.part_type_code , mdr.sides ,mdr.defect_location_code ,mdr.defect_code "); hql.append(" from mes_defect_record as mdr"); hql.append(" inner join mes_part as mp where mdr.part_no = mp.part_no and mdr.organize_code = mp.organize_code "); hql.append(" and mdr.is_deleted = mp.is_deleted and mdr.is_valid = mp.is_valid "); @@ -45,7 +45,6 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { hql.append(" group by mdr.part_no ,mp.part_type_code mdr.sides ,mdr.defect_location_code ,mdr.defect_code "); hql.append(" having count() > " + count); - Query query = entityManager.createNativeQuery(hql.toString()); query.setParameter("organizeCode", organizeCode); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); @@ -67,9 +66,9 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { String defectCode = String.valueOf(cells[4]); model.setPartNo(partNo); model.setPartTypeCode(partTypeCode); - model.setSides(Integer.parseInt(sides)); - model.setDefectLocationCode(defectLocationCode); - model.setDefectCode(defectCode); + model.setFrontBack(Integer.parseInt(sides)); + model.setDefectLocation(defectLocationCode); + model.setDefectTypeCode(defectCode); modelList.add(model); } 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 new file mode 100644 index 0000000..4e5159f --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.ext.mes.apiservice.daoimpl; + +import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesShippingOrderManagementDetailDao; +import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :SAP生产计划 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/6 15:52 + * @Modify: + **/ +@Service +@Slf4j +public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrderManagementDetailDao { + + + @Autowired + private EntityManager entityManager; + + @Override + public int queryOrderDetailGroupByPartCount(MesShippingOrderManagementDetail detail) { + + StringBuffer hql = new StringBuffer("select count(1) "); + hql.append(" from mes_shipping_detail as msd"); + hql.append(" where msd.organize_code = :organizeCode "); + hql.append(" and msd.is_deleted = :isDeleted "); + hql.append(" and msd.is_valid = :isValid "); + + hql.append(" and msd.shipping_order_no = :shippingOrderNo "); + + hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit "); + + Query query = entityManager.createNativeQuery(hql.toString()); + query.setParameter("organizeCode", detail.getOrganizeCode()); + query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + query.setParameter("shippingOrderNo", detail.getShippingOrderNo()); + + List list = query.getResultList(); + + if (CollectionUtils.isEmpty(list)) { + return 0; + } + + return list.size(); + } + + @Override + public List queryOrderDetailGroupByPartInfo(MesShippingOrderManagementDetail detail, Pager pager) { + + + StringBuffer hql = new StringBuffer("select msd.part_no ,msd.part_name, msd.cust_part_no,sum( msd.plan_qty) as planQty , sum( msd.actual_qty) as actualQty, msd.unit "); + hql.append(" from mes_shipping_detail as msd"); + hql.append(" where msd.organize_code = :organizeCode "); + hql.append(" and msd.is_deleted = :isDeleted "); + hql.append(" and msd.is_valid = :isValid "); + + hql.append(" and msd.shipping_order_no = :shippingOrderNo "); + + hql.append(" group by msd.part_no ,msd.part_name,msd.cust_part_no,msd.unit "); + + Query query = entityManager.createNativeQuery(hql.toString()); + query.setParameter("organizeCode", detail.getOrganizeCode()); + query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + query.setParameter("shippingOrderNo", detail.getShippingOrderNo()); + + + query.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); + + List list = query.getResultList(); + List modelList = new ArrayList<>(); + + for (Object result : list) { + Object[] cells = (Object[]) result; + MesShippingOrderManagementDetailModel model = new MesShippingOrderManagementDetailModel(); + model.setPartNo(StringUtils.isEmpty(cells[0]) ? "" : String.valueOf(cells[0])); + model.setPartName(StringUtils.isEmpty(cells[1]) ? "" : String.valueOf(cells[1])); + model.setCustPartNo(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2])); + model.setActualQty(StringUtils.isEmpty(cells[3]) ? 0 : Integer.parseInt(String.valueOf(cells[3]))); + model.setActualQty(StringUtils.isEmpty(cells[4]) ? 0 : Integer.parseInt(String.valueOf(cells[4]))); + model.setUnit(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5])); + modelList.add(model); + } + + return modelList; + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectTypeService.java similarity index 53% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectTypeService.java index 8c2f6a3..488d156 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectTypeService.java @@ -1,11 +1,11 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesDefectService; +import cn.estsh.i3plus.ext.mes.api.base.IMesDefectTypeService; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -13,47 +13,47 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesDefectService extends BaseMesService implements IMesDefectService { +public class MesDefectTypeService extends BaseMesService implements IMesDefectTypeService { - protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) { - DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean); - DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean); - DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean); + protected void setPackQueryBean(MesDefectType bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getDefectTypeCode(), "defectTypeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getDefectTypeName(), "defectTypeName", packBean); + DdlPreparedPack.getNumEqualPack(bean.getDefectType(), "defectType", packBean); } - protected void onInsertBean(MesDefect item) { + protected void onInsertBean(MesDefectType item) { // 数据校验 - ValidatorBean.checkNotNull(item.getDefectCode(), "缺陷类型代码不能为空"); - ValidatorBean.checkNotNull(item.getDefectName(), "缺陷类型名称不能为空"); + ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型代码不能为空"); + ValidatorBean.checkNotNull(item.getDefectTypeName(), "缺陷类型名称不能为空"); DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getDefectCode(), "defectCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", packBean); boolean flg = baseRDao.isExitByHql(packBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectCode()) + .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectTypeCode()) .build(); } } - protected void onUpdateBean(MesDefect item) { + protected void onUpdateBean(MesDefectType item) { // 数据校验 - ValidatorBean.checkNotNull(item.getDefectCode(), "缺陷类型代码不能为空"); - ValidatorBean.checkNotNull(item.getDefectName(), "缺陷类型名称不能为空"); + ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型代码不能为空"); + ValidatorBean.checkNotNull(item.getDefectTypeName(), "缺陷类型名称不能为空"); DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getDefectCode(), "defectCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", packBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean); boolean flg = baseRDao.isExitByHql(packBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectCode()) + .setErrorDetail("【%s】缺陷类型代码已经存在，请检查数据", item.getDefectTypeCode()) .build(); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java similarity index 69% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java index f3cb373..62ed23c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java @@ -9,10 +9,10 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesDefect; -import cn.estsh.i3plus.pojo.mes.bean.MesDefectAlarmConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig; import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.repository.MesDefectRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesDefectTypeRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import java.util.List; @Service @Slf4j -public class MesDefectAlarmConfigService extends BaseMesService implements IMesDefectAlarmConfigService { +public class MesDefectWarnConfigService extends BaseMesService implements IMesDefectAlarmConfigService { @Autowired @@ -32,26 +32,25 @@ public class MesDefectAlarmConfigService extends BaseMesService implements IMesShippingOrderManagementDetailService { + @Autowired + private IMesShippingOrderManagementDetailDao shippingOrderManagementDetailDao; protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getShippingOrderNo(), "shippingOrderNo", packBean); } + public ListPager queryDetailGroupByPartNo(MesShippingOrderManagementDetail bean, Pager pager) { + + int count = shippingOrderManagementDetailDao.queryOrderDetailGroupByPartCount(bean); + + pager = PagerHelper.getPager(pager, count); + + List modelList = shippingOrderManagementDetailDao.queryOrderDetailGroupByPartInfo(bean, pager); + + return new ListPager<>(modelList, pager); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 0a31cf4..f78be46 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -129,7 +129,7 @@ public class MesShippingOrderManagementService extends BaseMesService { diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesDefectRecordModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesDefectRecordModel.java index 6ef5c9a..786249b 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesDefectRecordModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesDefectRecordModel.java @@ -14,11 +14,11 @@ public class MesDefectRecordModel { private String partTypeCode; @ApiParam("缺陷代码") - private String defectCode; + private String defectTypeCode; @ApiParam("位置") - private String defectLocationCode; + private String defectLocation; @ApiParam("面位-正反面") - private Integer sides; + private Integer frontBack; } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java new file mode 100644 index 0000000..366ac88 --- /dev/null +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.ext.mes.pojo.model; + + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MesShippingOrderManagementDetailModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料号") + private String partName; + + @ApiParam("客户零件号") + private String custPartNo; + + @ApiParam("计划发运数量") + private Double planQty; + + @ApiParam("实际发运数量") + private Integer actualQty; + + @ApiParam("计量单位") + private String unit; + + +}