From 4c6ee6446e5e897dd3724c6c26c62f9413d30f1d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 29 Sep 2024 17:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/roundness/MesPackageRoundnessService.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java index e028608..f0058d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java @@ -326,7 +326,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { Calendar custCalendar = Calendar.getInstance(); custCalendar.setTime(new Date()); GenSerialNoModel custGenSerialNoModel= new GenSerialNoModel("WH_CUST_SN_RULE"); - String partNo = mesWorkOrder.getPartNo(); + String partNo = mesWorkOrder.getCustPartNo(); String prefix = partNo.substring(0, partNo.length() - 4); String partNo4 = partNo.substring(partNo.length() - 4).toUpperCase(); custGenSerialNoModel.setPartNo(prefix+partNo4); @@ -467,7 +467,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { if (!assemblyList.isEmpty()) { for (MesWorkOrderAssembly orderAssembly : assemblyList) { orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); + orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()); orderAssembly.setOrganizeCode(organizeCode); + orderAssembly.setProductSn(mesWorkOrder.getWorkOrderNo()); ConvertBean.saveOrUpdate(orderAssembly, "MES-JOB"); } workOrderAssemblyRao.saveAll(assemblyList); @@ -572,6 +574,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { orderAssembly.setOrderPartId(orderPart.getId().toString()); orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode()); orderAssembly.setReportType(sortCfg.getReportType()); + if (sortCfg.getReportType() != null && sortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){ + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()); + }else { + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()); + } orderAssembly.setReportPartNo(sortCfg.getReportPartNo()); orderAssembly.setImageFileId(sortCfg.getImageFileId()); orderAssembly.setCraftCode(sortCfg.getCraftCode()); @@ -600,6 +607,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq()); orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode()); orderAssembly.setReportType(ruleSortCfg.getReportType()); + if (ruleSortCfg.getReportType() != null && ruleSortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){ + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()); + }else { + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()); + } orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo()); orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq()); orderAssembly.setPid(ruleSortCfg.getId()); @@ -624,6 +636,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { orderAssembly.setRouteSeq(ruleSortCfg.getRouteSeq()); orderAssembly.setEquipmentCode(ruleSortCfg.getEquipmentCode()); orderAssembly.setReportType(ruleSortCfg.getReportType()); + if (ruleSortCfg.getReportType() != null && ruleSortCfg.getReportType() == MesExtEnumUtil.MES_REPORT_TYPE.REPORT.getValue()){ + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()); + }else { + orderAssembly.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()); + } orderAssembly.setReportPartNo(ruleSortCfg.getReportPartNo()); orderAssembly.setProcessSeq(ruleSortCfg.getProcessSeq()); orderAssembly.setPid(ruleSortCfg.getId());