jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

主页面输入查询条件后未按查询条件查询

Browse Source
tags/yfai-mes-ext-v1.0
LML丶 12 months ago
parent 573ed6b5f8
commit e06f85e3c0
6 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File

13
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellExtendCfgService.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg;
/**
* @Description:
* @CreateDate 2024/04/16
* @Author mingliang.li
*/
public interface IMesWorkCellExtendCfgService extends IBaseMesService<MesWorkCellExtendCfg> {
}

13
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellSubCellService.java
Unescape Escape View File

@ -1,13 +0,0 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell;
/**
* @Description:
* @CreateDate 2024/04/16
* @Author mingliang.li
*/
public interface IMesWorkCellSubCellService extends IBaseMesService<MesWorkCellSubCell> {
}

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellSubCellController.java → modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellExtendCfgController.java
Unescape Escape View File

@ -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.MesWorkCellBin;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg;
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 + "/mesWorkCellSubCell")
public class MesWorkCellSubCellController extends BaseMesController<MesWorkCellSubCell> {
public class MesWorkCellExtendCfgController extends BaseMesController<MesWorkCellExtendCfg> {
}

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java
Unescape Escape View File

@ -6,6 +6,7 @@ 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.MesCarSeriesLoosePart;
import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
@ -56,4 +57,10 @@ public class MesCarSeriesLoosePartService extends BaseMesService<MesCarSeriesLoo
}
protected void setPackQueryBean(MesCarSeriesLoosePart bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustCode(),"custCode",packBean);
}
}

24
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesService.java
Unescape Escape View File

@ -20,19 +20,19 @@ public class MesCarSeriesService extends BaseMesService<MesCarSeries> implements
// 数据校验
ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空");
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
.setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustCode())
.build();
}
@ -42,19 +42,19 @@ public class MesCarSeriesService extends BaseMesService<MesCarSeries> implements
// 数据校验
ValidatorBean.checkNotNull(item.getCarSeriesCode(), "车系代码不能为空");
ValidatorBean.checkNotNull(item.getCarSeriesName(), "车系名称不能为空");
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCarSeriesCode(), "carSeriesCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", seriesPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", seriesPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
boolean flg = baseRDao.isExitByHql(seriesPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustomerCode())
.setErrorDetail("【%s】车系代码【%s】客户代码已经存在，请检查数据", item.getCarSeriesCode(), item.getCustCode())
.build();
}
}
@ -62,10 +62,10 @@ public class MesCarSeriesService extends BaseMesService<MesCarSeries> implements
protected void setPackQueryBean(MesCarSeries bean, DdlPackBean packBean) {
DdlPreparedPack.getStringLikerPack(bean.getCarSeriesCode(), "carSeriesCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCarSeriesName(), "carSeriesName", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getYearType(), "yearType", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustomerCarSeries(), "customerCarSeries", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getYearModel(), "yearModel", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustCarSerialCode(), "custCarSerialCode", packBean);
}
}

15
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellSubCellService.java → modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellExtendCfgService.java
Unescape Escape View File

@ -1,30 +1,29 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellSubCellService;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSubCell;
import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellExtendCfgService;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellExtendCfg;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class MesWorkCellSubCellService extends BaseMesService<MesWorkCellSubCell> implements IMesWorkCellSubCellService {
public class MesWorkCellExtendCfgService extends BaseMesService<MesWorkCellExtendCfg> implements IMesWorkCellExtendCfgService {
protected void onInsertBean(MesWorkCellSubCell item) {
protected void onInsertBean(MesWorkCellExtendCfg item) {
// 数据校验
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCode(), "主工位不能为空");
ValidatorBean.checkNotNull(item.getSubCellCode(), "子工位不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCodeBak(), "子工位不能为空");
}
protected void onUpdateBean(MesWorkCellSubCell item) {
protected void onUpdateBean(MesWorkCellExtendCfg item) {
// 数据校验
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCode(), "主工位不能为空");
ValidatorBean.checkNotNull(item.getSubCellCode(), "子工位不能为空");
ValidatorBean.checkNotNull(item.getWorkCellCodeBak(), "子工位不能为空");
}
}
Write Preview
Loading…
Cancel
Save