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
tags/yfai-mes-ext-v1.0
jun 12 months ago
parent 630bf2dd61 a881b3ec49
commit 72b41b32b1
4 changed files with 123 additions and 10 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/IMesMouldMappingCfgService.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.ext.mes.api.base;
import cn.estsh.i3plus.pojo.mes.bean.MesMouldMappingCfg;
/**
* @Description :模具映射关系维护
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/20 10:06
* @Modify:
**/
public interface IMesMouldMappingCfgService extends IBaseMesService<MesMouldMappingCfg> {
}

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

@ -0,0 +1,18 @@
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.MesMouldMappingCfg;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description :模具映射关系维护
* @Reference :
* @Author : gsz
* @CreateDate : 2024-05-20 10:16
* @Modify:
**/
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMouldMappingCfg")
public class MesMouldMappingCfgController extends BaseMesController<MesMouldMappingCfg>{
}

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

@ -0,0 +1,70 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesMouldMappingCfgService;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.util.MesConstWords;
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.*;
import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
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.Objects;
/**
* @Description : 模具映射关系维护
* @Reference :
* @Author : gsz
* @CreateDate 2024/5/20 10:06
* @Modify:
**/
@Service
@Slf4j
public class MesMouldMappingCfgServiceImpl extends BaseMesService<MesMouldMappingCfg> implements IMesMouldMappingCfgService {
@Autowired
private MesEquipmentRepository mesEquipmentRDao;
protected void setPackQueryBean(MesMouldMappingCfg bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
// DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);
}
protected void onInsertBean(MesMouldMappingCfg item) {
// 数据校验
ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
ValidatorBean.checkNotNull(item.getAssetNum(), "assetNum不能为空" );
ValidatorBean.checkNotNull(item.getMouldNo(), "mouldNo不能为空");
ValidatorBean.checkNotNull(item.getEquipmentCode(), "equipmentCode不能为空");
MesEquipment mesEquipmentDb = mesEquipmentRDao.getByProperty(
new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_DELETED, MesConstWords.IS_VALID, "equipmentCode"},
new Object[]{item.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
CommonEnumUtil.IS_VAILD.VAILD.getValue(), item.getEquipmentCode()});
if (null == mesEquipmentDb) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("设备代码【%s】无效", item.getEquipmentCode())
.build();
}
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getAssetNum(), "assetNum", packBean);
DdlPreparedPack.getStringEqualPack(item.getMouldNo(), "mouldNo", packBean);
DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", packBean);
boolean flg = baseRDao.isExitByHql(packBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("maximo模具号【%s】设备代码【%s】已经存在，请检查数据", item.getAssetNum(),item.getEquipmentCode())
.build();
}
}
}

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

@ -1,8 +1,8 @@
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.IMesPartService;
import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -25,6 +26,8 @@ import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
@Slf4j
@ -47,6 +50,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
@Autowired
private MesPartRepository partRepository;
@Autowired
private IMesPartService partService;
protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
@ -120,6 +126,11 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
groupDetailList.forEach(k -> {
MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode());
detail.setPartName(part.getPartName());
detail.setCustPartNo(k.getCustomerPartNo());
detail.setPlanQty(1D);
detail.setActualQty(1);
detail.setShippingOrderNo(finalBean.getShippingOrderNo());
detail.setOrganizeCode(k.getOrganizeCode());
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
@ -259,12 +270,13 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
DdlPreparedPack.getStringEqualPack(originBean.getShippingOrderNo(), "shippingOrderNo", detailPackBean);
List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
;
Map<String, List<MesShippingOrderManagementDetail>> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo()));
List<MesJisShipping> jisShippingList = new ArrayList<>();
detailDeleteList.forEach(k -> {
detailMap.forEach((k, v) -> {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(v.get(0).getPartNo(), "partNo", packBean);
MesPart part = partRepository.getByProperty(packBean);
MesJisShipping jisShipping = new MesJisShipping();
@ -277,13 +289,13 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE"));
jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS"));
jisShipping.setCusDock(originBean.getCustDockCode());
jisShipping.setCustOrderNo(k.getCustOrderNo());
jisShipping.setSerialNumber(k.getBarcode());
jisShipping.setQuantityPerCar(detailDeleteList.size());
jisShipping.setCustOrderNo(v.get(0).getCustOrderNo());
jisShipping.setSerialNumber(v.get(0).getBarcode());
jisShipping.setQuantityPerCar(v.size());
jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
jisShipping.setVin(k.getVin());
jisShipping.setCarNo(k.getVin());
if(!StringUtils.isEmpty(part)){
jisShipping.setVin(v.get(0).getVin());
jisShipping.setCarNo(v.get(0).getVin());
if (!StringUtils.isEmpty(part)) {
jisShipping.setUnit(part.getUnit());
}
jisShipping.setOffTime(TimeTool.getNowTime(true));

Write Preview
Loading…
Cancel
Save