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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinCfgController.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java
tags/yfai-mes-ext-v1.0
LML丶 12 months ago
parent 2b01910d78 a8f28c5cbe
commit 2cd16dd40e
7 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File

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

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

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

@ -27,18 +27,18 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
protected void onInsertBean(MesCustomerOriganze item) { protected void onInsertBean(MesCustomerOriganze item) {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", roadPackBean); DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean); boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) { if (flg) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getCustomerOrganizeCode(),item.getCustomerCode()) .setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getCustOrganizeCode(),item.getCustCode())
.build(); .build();
} }
@ -46,11 +46,11 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
protected void onUpdateBean(MesCustomerOriganze item) { protected void onUpdateBean(MesCustomerOriganze item) {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerOrganizeCode(), "customerOrganizeCode", roadPackBean); DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", roadPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean); boolean flg = baseRDao.isExitByHql(roadPackBean);
@ -58,16 +58,16 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getCustomerOrganizeCode(),item.getCustomerCode()) .setErrorDetail("客户工厂【%s】下客户代码【%s】已经存在，请检查数据", item.getCustOrganizeCode(),item.getCustCode())
.build(); .build();
} }
} }
protected void setPackQueryBean(MesCustomerOriganze bean, DdlPackBean packBean) { protected void setPackQueryBean(MesCustomerOriganze bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustomerOrganizeName(), "customerOrganizeName", packBean); DdlPreparedPack.getStringLikerPack(bean.getCustOrganizeName(), "custOrganizeName", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
} }
@ -75,12 +75,12 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
MesCustomerOriganze mesCustomerOriganze = baseRDao.getById(id); MesCustomerOriganze mesCustomerOriganze = baseRDao.getById(id);
//校验客户车型配置 //校验客户车型配置
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomerOriganze.getOrganizeCode()); DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomerOriganze.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesCustomerOriganze.getCustomerOrganizeCode(), "customerOrganizeCode", packBean); DdlPreparedPack.getStringEqualPack(mesCustomerOriganze.getCustOrganizeCode(), "customerOrganizeCode", packBean);
if(mesCustomerCarModelRDao.isExitByHql(packBean)){ if(mesCustomerCarModelRDao.isExitByHql(packBean)){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户工厂【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomerOriganze.getCustomerOrganizeCode()) .setErrorDetail("客户工厂【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomerOriganze.getCustOrganizeCode())
.build(); .build();
} }
} }

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

@ -35,7 +35,7 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) { protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getErpPartNo(), "erpPartNo", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean); DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean);
} }
@ -43,19 +43,19 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
protected void onInsertBean(MesCustomerPart item) { protected void onInsertBean(MesCustomerPart item) {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); ValidatorBean.checkNotNull(item.getErpPartNo(), "零件号不能为空");
ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空"); ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空");
DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getErpPartNo(), "erpPartNo", cellBinPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean);
boolean flg = baseRDao.isExitByHql(cellBinPackBean); boolean flg = baseRDao.isExitByHql(cellBinPackBean);
if (flg) { if (flg) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode()) .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getErpPartNo(), item.getCustomerCode())
.build(); .build();
} }
@ -64,21 +64,21 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
protected void onUpdateBean(MesCarSeriesLoosePart item) { protected void onUpdateBean(MesCarSeriesLoosePart item) {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空"); ValidatorBean.checkNotNull(item.getCustPartNo(), "客户零件号不能为空");
DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", cellBinPackBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getCustPartNo(), "custPartNo", cellBinPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
boolean flg = baseRDao.isExitByHql(cellBinPackBean); boolean flg = baseRDao.isExitByHql(cellBinPackBean);
if (flg) { if (flg) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode()) .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustPartNo(), item.getPartNo(), item.getCustCode())
.build(); .build();
} }

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

@ -32,16 +32,16 @@ public class MesCustomerService extends BaseMesService<MesCustomer> implements I
protected void onInsertBean(MesCustomer item) { protected void onInsertBean(MesCustomer item) {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean); boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) { if (flg) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustomerCode()) .setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustCode())
.build(); .build();
} }
@ -65,30 +65,30 @@ public class MesCustomerService extends BaseMesService<MesCustomer> implements I
} }
protected void setPackQueryBean(MesCustomer bean, DdlPackBean packBean) { protected void setPackQueryBean(MesCustomer bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCustomerName(), "customerName", packBean); DdlPreparedPack.getStringLikerPack(bean.getCustName(), "custName", packBean);
} }
protected void onDeleteId(Long id) { protected void onDeleteId(Long id) {
MesCustomer mesCustomer = baseRDao.getById(id); MesCustomer mesCustomer = baseRDao.getById(id);
//校验客户物料是否存在 //校验客户物料是否存在
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode()); DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesCustomer.getCustomerCode(), "customerCode", packBean); DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean);
if(mesCustomerPartRDao.isExitByHql(packBean)){ if(mesCustomerPartRDao.isExitByHql(packBean)){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户代码【%s】存在客户零件号信息，请先删除对应的客户零件号信息", mesCustomer.getCustomerCode()) .setErrorDetail("客户代码【%s】存在客户零件号信息，请先删除对应的客户零件号信息", mesCustomer.getCustCode())
.build(); .build();
} }
//校验客户车型配置 //校验客户车型配置
packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode()); packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesCustomer.getCustomerCode(), "customerCode", packBean); DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean);
if(mesCustomerCarModelRDao.isExitByHql(packBean)){ if(mesCustomerCarModelRDao.isExitByHql(packBean)){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户代码【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomer.getCustomerCode()) .setErrorDetail("客户代码【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomer.getCustCode())
.build(); .build();
} }
} }

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

@ -79,7 +79,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
.setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode()) .setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode())
.build(); .build();
} }
if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序 if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getCenterType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@ -182,7 +182,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
.setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode()) .setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode())
.build(); .build();
} }
if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序 if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getCenterType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())

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

@ -31,7 +31,9 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空"); ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空"); ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空"); ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
/*
ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空"); ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
*/
DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);
@ -56,7 +58,9 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空"); ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空"); ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空"); ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
/*
ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空"); ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
*/
DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);

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

@ -93,7 +93,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
BeanUtils.copyProperties(bean, copyMesWorkOrder); BeanUtils.copyProperties(bean, copyMesWorkOrder);
copyMesWorkOrder.setProduceSeq(produceSeq + 1); copyMesWorkOrder.setProduceSeq(produceSeq + 1);
copyMesWorkOrder.setQty(1D); copyMesWorkOrder.setQty(1D);
copyMesWorkOrder.setOrderNo(resultList.get(0) + "_" + copyMesWorkOrder.getOrganizeCode()); copyMesWorkOrder.setWorkOrderNo(resultList.get(0) + "_" + copyMesWorkOrder.getOrganizeCode());
ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
MesWorkOrderLog workOrderLog = new MesWorkOrderLog(); MesWorkOrderLog workOrderLog = new MesWorkOrderLog();
@ -123,7 +123,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} }
genSerialNoModel.setPartNo(bean.getPartNo()); genSerialNoModel.setPartNo(bean.getPartNo());
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setOrderNo(resultList.get(0) + "_" + bean.getOrganizeCode()); bean.setWorkOrderNo(resultList.get(0) + "_" + bean.getOrganizeCode());
bean.setQty(bean.getQty()); bean.setQty(bean.getQty());
ConvertBean.serviceModelInitialize(bean, bean.getCreateUser()); ConvertBean.serviceModelInitialize(bean, bean.getCreateUser());
@ -214,7 +214,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) { protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) {
DdlPreparedPack.getStringLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean);
DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean);
DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
@ -323,7 +323,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
DdlPackBean ddlPackBean; DdlPackBean ddlPackBean;
ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean);
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(item.getProductVersion(), "productVersion", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getProductVersion(), "productVersion", ddlPackBean);
if (!mesProductVersionRDao.isExitByHql(ddlPackBean)) { if (!mesProductVersionRDao.isExitByHql(ddlPackBean)) {
MesException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(), mesWorkCenter.getWorkCenterCode(), item.getProductVersion()); MesException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(), mesWorkCenter.getWorkCenterCode(), item.getProductVersion());
@ -334,12 +334,12 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
DdlPackBean ddlPackBean; DdlPackBean ddlPackBean;
ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean);
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean);
ddlPackBean.setOrderByStr(" order by createDatetime desc "); ddlPackBean.setOrderByStr(" order by createDatetime desc ");
MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean);
if(Objects.isNull(mesProductVersion)){ if(Objects.isNull(mesProductVersion)){
MesException.throwMesBusiException("物料【%s】工作中心【%s】对应的生产版本信息不存在",item.getPartNo(), MesException.throwMesBusiException("物料【%s】工作中心【%s】对应的生产版本信息不存在",item.getPartNo(),
mesWorkCenter.getSapWorkCenter()); mesWorkCenter.getErpWorkCenter());
} }
return mesProductVersion; return mesProductVersion;
} }
@ -395,7 +395,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
//获取生产版本 //获取生产版本
ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", ddlPackBean);
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProductVersion(), "productVersion", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProductVersion(), "productVersion", ddlPackBean);
MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean);
if (null == mesProductVersion) { if (null == mesProductVersion) {
@ -461,11 +461,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
newMesProductOffLine.setSerialNumber(sn); newMesProductOffLine.setSerialNumber(sn);
newMesProductOffLine.setUnit(mesBom.getUnit()); newMesProductOffLine.setUnit(mesBom.getUnit());
newMesProductOffLine.setItemUnit(mesBom.getItemUnit()); newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getOrderNo()); newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
newMesProductOffLine.setReportType(mesWorkOrder.getReportType()); newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
newMesProductOffLine.setSapWorkCenter(mesWorkCenter.getSapWorkCenter()); newMesProductOffLine.setSapWorkCenter(mesWorkCenter.getErpWorkCenter());
newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode()); newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser()); ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser());

Write Preview
Loading…
Cancel
Save