diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IBaseMesService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IBaseMesService.java index bc9b3be..61ba932 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IBaseMesService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IBaseMesService.java @@ -40,6 +40,9 @@ public interface IBaseMesService { @ApiOperation(value = "批量新增数据", notes = "批量新增数据") List insertBatch(List bean); + @ApiOperation(value = "校验导入数据", notes = "校验导入数据") + void validateImport(List bean); + @ApiOperation(value = "修改信息", notes = "修改信息") T update(T bean); 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 index 5f0444b..028f453 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig; /** * @Description: @@ -9,5 +10,4 @@ import cn.estsh.i3plus.pojo.mes.bean.MesDefectType; */ public interface IMesDefectTypeService extends IBaseMesService { - } 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/IMesDefectWarnConfigService.java similarity index 71% rename from modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectAlarmConfigService.java rename to modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectWarnConfigService.java index 2fbc3c4..7ed8d75 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/IMesDefectWarnConfigService.java @@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig; * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesDefectAlarmConfigService extends IBaseMesService { +public interface IMesDefectWarnConfigService extends IBaseMesService { public void saveDefectAlarmConfigByJob(String org); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index b367403..4857ac6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -418,7 +418,7 @@ public abstract class BaseMesController extends BaseControll List beanList = excelTool.importData(file.getOriginalFilename(), file.getInputStream(), mesClass); // 校验导入数据 - validateImport(beanList); + baseService.validateImport(beanList); String userName = AuthUtil.getSessionUser().getUserName(); String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); // 导入数据初始化 diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderPartController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderPartController.java new file mode 100644 index 0000000..9b80dfc --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderPartController.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController; +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api("点检单明细物料") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesSpotCheckOrderPart") +public class MesSpotCheckOrderPartController extends BaseMesController { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java index 9948eb3..df39e0e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.schedulejob; -import cn.estsh.i3plus.ext.mes.api.base.IMesDefectAlarmConfigService; +import cn.estsh.i3plus.ext.mes.api.base.IMesDefectWarnConfigService; import cn.estsh.i3plus.mes.apiservice.schedulejob.BaseMesScheduleJob; import cn.estsh.impp.framework.boot.init.ApplicationProperties; import com.alibaba.fastjson.JSONObject; @@ -35,7 +35,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob { private static final long serialVersionUID = 9072058154235836696L; @Autowired - private IMesDefectAlarmConfigService defectAlarmConfigService; + private IMesDefectWarnConfigService defectWarnConfigService; @Value("${server.port}") private String serverPort; @@ -75,7 +75,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob { for (String organizeCode : organizeCodeList) { - defectAlarmConfigService.saveDefectAlarmConfigByJob(organizeCode); + defectWarnConfigService.saveDefectAlarmConfigByJob(organizeCode); } LOGGER.info("缺陷告警配置job结束 ----- end"); 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 dd17887..5bcfaeb 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 @@ -12,8 +12,10 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.springframework.beans.factory.annotation.Autowired; import java.lang.reflect.ParameterizedType; @@ -154,6 +156,12 @@ public abstract class BaseMesService implements IBaseMesServ new Object[]{status, userName, TimeTool.getNowTime(true)}); } + @Override + public void validateImport(List beanList) { + /* 新增数据校验 */ + ValidatorBean.beginValid(beanList); + } + protected void onInsertBean(T item) { } 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 512d278..9185e4a 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 @@ -7,12 +7,15 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze; import cn.estsh.i3plus.pojo.mes.repository.MesCustomerCarModelRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesCustomerRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author yinxiao * @date 2023-2023/6/2 10:54 @@ -24,6 +27,8 @@ public class MesCustomerOriganzeService extends BaseMesService beanList) { + + for (MesCustomerOriganze bean : beanList) { + + //todo + //查询数据库校验字段,待确定 +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); +// DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean); +// MesCustomer customer = customerRepository.getByProperty(packBean); +// if (StringUtils.isEmpty(customer)) { +// throw new ImppBusiException(String.format("客户代码【%s】不存在", bean.getCustCode())); +// } +// +// bean.setCustName(customer.getCustName()); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java index 62ed23c..5adb4f1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; -import cn.estsh.i3plus.ext.mes.api.base.IMesDefectAlarmConfigService; +import cn.estsh.i3plus.ext.mes.api.base.IMesDefectWarnConfigService; import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesDefectRecordDao; import cn.estsh.i3plus.ext.mes.pojo.model.MesDefectRecordModel; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; @@ -24,7 +24,7 @@ import java.util.List; @Service @Slf4j -public class MesDefectWarnConfigService extends BaseMesService implements IMesDefectAlarmConfigService { +public class MesDefectWarnConfigService extends BaseMesService implements IMesDefectWarnConfigService { @Autowired diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinCfgService.java index c6c05ce..d58eb4c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinCfgService.java @@ -74,4 +74,9 @@ public class MesWorkCellBinCfgService extends BaseMesService } } + protected void setPackQueryBean(MesWorkCellBinCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getBinCode(), "binCode", packBean); + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java index 614c2c2..ad93890 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java @@ -6,7 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesSpotCheckOrderPartService extends BaseMesService implements IMesSpotCheckOrderPartService { + }