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

新增cockpit发运处理功能

Browse Source
uat-temp-logic-20250313-45610
jason 3 months ago
parent 078f86e8d3
commit f29bef72a0
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.ext.mes.pojo.model.MesHandleShippingErrorModel;
import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@ -70,9 +71,16 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
@ApiOperation(value = "cockpit发运处理", notes = "cockpit发运处理")
@PostMapping("/handle-cockpit-shipping-error")
public ResultBean handleCockpitShippingError(MesShippingOrderManagementDetail detail, MesWorkOrder workOrder) {
public ResultBean handleCockpitShippingError(@RequestBody MesHandleShippingErrorModel request) {
try {
shippingOrderManagementDetailService.doHandleCockpitShippingError(detail, workOrder);
MesShippingOrderManagementDetail detail = shippingOrderManagementDetailService.get(request.getDetail().getId());
if (detail == null) {
return ResultBean.fail("无效发运单明细");
}
if (detail.getPid() == null) {
return ResultBean.fail("发运单明细未关联有效发运单");
}
shippingOrderManagementDetailService.doHandleCockpitShippingError(detail, request.getWorkOrder());
return ResultBean.success("处理成功");
} catch (ImppBusiException e) {
return ResultBean.fail(e);

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

@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService
import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesShippingOrderManagementDetailDao;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@ -239,8 +240,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
public MesJisShipping getMesJisShipping(MesShippingOrderManagement orderManagement,MesShippingOrderManagementDetail detail, String srcLocateNo, MesWorkOrderPart orderPart, String userName) {
MesJisShipping jisShipping = new MesJisShipping();
BeanUtils.copyProperties(orderManagement, jisShipping);
BeanUtils.copyProperties(detail, jisShipping);
BeanUtils.copyProperties(orderManagement, jisShipping, MesExtConstWords.ID);
BeanUtils.copyProperties(detail, jisShipping, MesExtConstWords.ID);
jisShipping.setFactoryCode(orderManagement.getCustOrganizeCode());
jisShipping.setShippingTime(TimeTool.getNowTime(true));
jisShipping.setErpWarerhouse(srcLocateNo);
@ -259,6 +260,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
jisShipping.setOffTime(TimeTool.getNowTime(true));
jisShipping.setShippingOrderCode(orderManagement.getShippingCode());
jisShipping.setFid(UUID.randomUUID().toString());
jisShipping.setRemark(null);
jisShipping.setDescription(null);
jisShipping.setSystemSyncStatus(CommonEnumUtil.FALSE);
ConvertBean.serviceModelInitialize(jisShipping, userName);
return jisShipping;
@ -340,8 +343,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
if (StringUtils.isEmpty(detail.getPartNo())) {
MesException.throwFlowException("发运单明细对应零件号为空");
}
if (StringUtils.isEmpty(detail.getBarcode())) {
MesException.throwMesBusiException("发运单条码信息不存在");
if (StringUtils.isEmpty(workOrder.getCustSn())) {
MesException.throwMesBusiException("工单【%s】不存在客户条码", workOrder.getWorkOrderNo());
}
String organizeCode = AuthUtil.getOrganizeCode();
String userName = AuthUtil.getSessionUser().getUserName();
@ -376,8 +379,11 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
for (MesWorkOrderPart orderPart : workOrderParts) {
MesPart itemPart = mesPartService.getPartByPartNo(orderPart.getPartNo(), organizeCode);
if (itemPart == null) {
continue;
}
MesMoveRule moveRule = mesMoveRuleMap.get(itemPart.getEsd());
if (Objects.equals(moveRule.getMoveNum(), MesExtEnumUtil.MOVE_RULE_MOVE_NUM.MOVE_RULE_MOVE_NUM_20.getValue()) && MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
if (moveRule != null && Objects.equals(moveRule.getMoveNum(), MesExtEnumUtil.MOVE_RULE_MOVE_NUM.MOVE_RULE_MOVE_NUM_20.getValue()) && MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
shippingList.add(getMesJisShipping(orderManagement, detail, moveRule.getErpSrcLocateNo(), orderPart, userName));
} else {
log.info("客供品移库零件【{}】在零件发运组【{}】的移库规则中，汇报类型未维护或不为发运", orderPart.getPartNo(), workOrder.getPartProdGroupCode());
@ -387,8 +393,8 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
jisShippingRepository.saveAll(shippingList);
}
List<MesProduceSn> mesProduceSnList = mesProduceSnService.findMesProduceSn(organizeCode, detail.getBarcode());
for (MesProduceSn mesProduceSn : mesProduceSnList) {
MesProduceSn mesProduceSn = mesProduceSnService.getMesProduceSnByCustSn(organizeCode, workOrder.getCustSn());
if (mesProduceSn != null) {
//更新条码状态为完成
mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
mesProduceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
@ -401,6 +407,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
ConvertBean.serviceModelUpdate(workOrder, userName);
mesWorkOrderRDao.update(workOrder);
detail.setBarcode(workOrder.getWorkOrderNo() + "," + workOrder.getCustSn());
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
detail.setRemark("cockpit发运处理");

11
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesHandleShippingErrorModel.java
Unescape Escape View File

@ -0,0 +1,11 @@
package cn.estsh.i3plus.ext.mes.pojo.model;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
import lombok.Data;
@Data
public class MesHandleShippingErrorModel {
private MesShippingOrderManagementDetail detail;
private MesWorkOrder workOrder;
}
Write Preview
Loading…
Cancel
Save