puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

46348 PCN：排序汇报的汇报类型错误，显示“报工调整”

Browse Source
dev_temp_xw_202504180000_46348
xiangwei.zhang 3 months ago
parent 9bc3922048
commit dea86d3e38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
Unescape Escape View File

@ -293,7 +293,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
newMesProductOffLine.setWorkOrderType(mesWorkOrderDb.getWorkOrderType()); newMesProductOffLine.setWorkOrderType(mesWorkOrderDb.getWorkOrderType());
newMesProductOffLine.setWorkCenterCode(mesWorkOrderDb.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(mesWorkOrderDb.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(mesWorkOrderDb.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrderDb.getWorkCellCode());
newMesProductOffLine.setReportType(mesWorkOrderDb.getReportType()); newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
newMesProductOffLine.setSapWorkCenter(mesWorkOrderDb.getErpWorkCenter()); newMesProductOffLine.setSapWorkCenter(mesWorkOrderDb.getErpWorkCenter());
newMesProductOffLine.setOrganizeCode(organizeCode); newMesProductOffLine.setOrganizeCode(organizeCode);
newMesProductOffLine.setDescription(mesProductionRecord.getCompleteDateTime()); newMesProductOffLine.setDescription(mesProductionRecord.getCompleteDateTime());
@ -769,7 +769,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
newMesProductOffLine.setWorkOrderType(oldMesWorkOrder.getWorkOrderType()); newMesProductOffLine.setWorkOrderType(oldMesWorkOrder.getWorkOrderType());
newMesProductOffLine.setWorkCenterCode(oldMesWorkOrder.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(oldMesWorkOrder.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(oldMesWorkOrder.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(oldMesWorkOrder.getWorkCellCode());
newMesProductOffLine.setReportType(oldMesWorkOrder.getReportType()); newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
if (Objects.equals(MesExtEnumUtil.ORDER_TYPE.BTO.getValue(), oldMesWorkOrder.getWorkOrderType())){ if (Objects.equals(MesExtEnumUtil.ORDER_TYPE.BTO.getValue(), oldMesWorkOrder.getWorkOrderType())){
newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
} }
@ -1446,7 +1446,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType()); newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
newMesProductOffLine.setReportType(mesWorkOrder.getReportType()); newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode()); newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode()); newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
newMesProductOffLine.setDescription(nowTime); newMesProductOffLine.setDescription(nowTime);
@ -1733,7 +1733,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
newMesProductOffLine.setWorkOrderType(workOrder.getWorkOrderType()); newMesProductOffLine.setWorkOrderType(workOrder.getWorkOrderType());
newMesProductOffLine.setWorkCenterCode(record.getWorkCenterCode()); newMesProductOffLine.setWorkCenterCode(record.getWorkCenterCode());
newMesProductOffLine.setWorkCellCode(record.getWorkCellCode()); newMesProductOffLine.setWorkCellCode(record.getWorkCellCode());
newMesProductOffLine.setReportType(record.getReportType()); newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
newMesProductOffLine.setOrganizeCode(model.getOrganizeCode()); newMesProductOffLine.setOrganizeCode(model.getOrganizeCode());
newMesProductOffLine.setDescription(record.getCompleteDateTime()); newMesProductOffLine.setDescription(record.getCompleteDateTime());
ConvertBean.serviceModelInitialize(newMesProductOffLine, model.getUserName()); ConvertBean.serviceModelInitialize(newMesProductOffLine, model.getUserName());

Write Preview
Loading…
Cancel
Save