diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java new file mode 100644 index 0000000..c241693 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesPartTypeDefectService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java new file mode 100644 index 0000000..f99a11a --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture; + +/** + * @Description: + * @CreateDate 2024/04/16 + * @Author mingliang.li + */ +public interface IMesPartTypePictureService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java index 5d96351..d904058 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseExtDataController.java @@ -1621,7 +1621,8 @@ public class BaseExtDataController extends MesBaseController { ValidatorBean.beginValid(mesDefect) .notNull("defectCode", mesDefect.getDefectCode()) .notNull("defectName", mesDefect.getDefectName()) - .notNull("defectType", mesDefect.getDefectType()); +// .notNull("defectType", mesDefect.getDefectType()) + ; mesDefect.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); ConvertBean.modelInitialize(mesDefect, AuthUtil.getSessionUser()); @@ -1648,7 +1649,8 @@ public class BaseExtDataController extends MesBaseController { ValidatorBean.beginValid(mesDefect) .notNull("defectCode", mesDefect.getDefectCode()) .notNull("defectName", mesDefect.getDefectName()) - .notNull("defectType", mesDefect.getDefectType()); +// .notNull("defectType", mesDefect.getDefectType()) + ; defectService.updateMesDefect(mesDefect); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java new file mode 100644 index 0000000..37a26f6 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java @@ -0,0 +1,16 @@ +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.MesPartTypeDefect; +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 + "/mesPartTypeDefect") +public class MesPartTypeDefectController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectManagementController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypePictureController.java similarity index 51% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectManagementController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypePictureController.java index b866e77..8640e39 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesDefectManagementController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypePictureController.java @@ -1,14 +1,16 @@ 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.MesDefectManagement; +import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api("可疑缺陷管理") +/** + * 物料发运组 + */ +@Api("零件类型与图片的对应关系") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDefectManagement") - -public class MesDefectManagementController extends BaseMesController { +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartTypePicture") +public class MesPartTypePictureController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java new file mode 100644 index 0000000..cae3508 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeDefectService; +import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesPartTypeDefectService extends BaseMesService implements IMesPartTypeDefectService { + +// 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); +// } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java new file mode 100644 index 0000000..ce7ddd5 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypePictureService; +import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesPartTypePictureService extends BaseMesService implements IMesPartTypePictureService { + +// 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); +// } + +}