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丶 1 year ago
parent c9ca2e0d34
commit f092f6f434
1 changed files with 80 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -8,11 +8,9 @@ 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.MesLoadingVehiclesOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesLoadingVehiclesOrderDetail;
import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -36,6 +34,8 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
@Autowired
private MesPartShippingGroupRepository partShippingGroupRepository;
@Autowired
private MesShippingOrderManagementRepository shippingOrderManagementRepository;
@Override
@ -86,20 +86,29 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
.build();
}
// bean.setIsLoading(partShippingGroup.getIsLoading());
bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
bean.setIsEnableMemory(partShippingGroup.getIsEnableMemory());
List<MesLoadingVehiclesOrderDetail> detailList = new ArrayList<>();
MesLoadingVehiclesOrder finalBean = bean;
List<String> orderNoList = new ArrayList<>();
bean.getShippingOrderNoList().forEach(k -> {
MesLoadingVehiclesOrderDetail detail = new MesLoadingVehiclesOrderDetail();
orderNoList.add(k.getShippingOrderNo());
BeanUtils.copyProperties(k, detail, "id");
detail.setLoadingOrderNo(finalBean.getLoadingOrderNo());
detail.setWeatherCondition(finalBean.getWeatherCondition());
detailList.add(detail);
});
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getInPackList(orderNoList, "shippingOrderNo", orderPackBean);
List<MesShippingOrderManagement> orderManagementList = shippingOrderManagementRepository.findByHqlWhere(orderPackBean);
orderManagementList.forEach(k -> k.setLoadingOrderNo(finalBean.getLoadingOrderNo()));
String customerCode = bean.getShippingOrderNoList().get(0).getCustomerCode();
String customerName = bean.getShippingOrderNoList().get(0).getCustomerName();
String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustomerOrganizeCode();
@ -110,8 +119,9 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
bean.setCustomerName(customerName);
bean.setCustomerOrganizeCode(customerOrganizeCode);
bean.setCustomerOrganizeName(customerOrganizeName);
//TODO 状态待确定
// bean.setStatus(MesExtEnumUtil.);
shippingOrderManagementRepository.saveAll(orderManagementList);
detailService.insertBatch(detailList);
bean = baseRDao.insert(bean);
return bean;
@ -137,6 +147,57 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
}
}
// @Override
// public MesLoadingVehiclesOrder update(MesLoadingVehiclesOrder bean) {
// //更新前构造并校验数据
// onUpdateBean(bean);
//
// MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0);
// DdlPackBean partShipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
// DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingGroupNo(), "shippingGroupNo", partShipGroupPackBean);
// MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getByProperty(partShipGroupPackBean);
//
// if (StringUtils.isEmpty(partShippingGroup)) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("【%s】零件发运组数据为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
// .build();
// }
//
// if (StringUtils.isEmpty(partShippingGroup.getIsLoading()) || partShippingGroup.getIsLoading() == 0) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("【%s】零件发运组是否有装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
// .build();
// }
// if (partShippingGroup.getIsLoading() == MesCommonConstant.FALSE_INTEGER) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("【%s】零件发运组是否有装车配置为否，则不需要生成装车单，请检查数据", shippingOrderManagement.getShippingGroupNo())
// .build();
// }
//
// if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall()) || partShippingGroup.getIsFirstInstall() == 0) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
// .build();
// }
// if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory()) || partShippingGroup.getIsEnableMemory() == 0) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("【%s】零件发运组是否启用记忆不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
// .build();
// }
//
// }
protected void onInsertBean(MesLoadingVehiclesOrder item) {
List<String> shippingOrderNoList = new ArrayList<>();
@ -159,6 +220,18 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
.build();
}
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getLoadingOrderNo(), "loadingOrderNo", partPackBean);
// DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", partPackBean);
boolean flg = baseRDao.isExitByHql(partPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("发运单【%s】已经存在，请检查数据", item.getLoadingOrderNo())
.build();
}
}
protected void setPackQueryBean(MesLoadingVehiclesOrder bean, DdlPackBean packBean) {

Write Preview
Loading…
Cancel
Save