From e9a9e7827a8e148a77fa695efb3130a01de73533 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 19 Oct 2024 13:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=20=E5=AD=97=E6=AE=B5=20pojo=20?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D=E5=8F=98=E6=9B=B4=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesPullingOrderInfoService.java | 4 +-- .../serviceimpl/base/MesWorkOrderService.java | 36 +++++++++++----------- .../base/roundness/MesPackageRoundnessService.java | 4 +-- .../base/roundness/MesTimeRoundnessService.java | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java index 8b41be7..8a3ece4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java @@ -216,7 +216,7 @@ public class MesPullingOrderInfoService extends BaseMesService implements DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", orderPackBean); DdlPreparedPack.getStringEqualPack(bean.getOrderFlag(), "orderFlag", orderPackBean); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"produceSeq"}, orderPackBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"productSeq"}, orderPackBean); MesWorkOrder result = baseRDao.getByProperty(orderPackBean); //插入前构造数据 @@ -164,13 +164,13 @@ public class MesWorkOrderService extends BaseMesService implements //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + Long productSeq = 0L; + if (null != result && result.getProductSeq() != null) { + productSeq = (long) Math.toIntExact(result.getProductSeq()); } MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); BeanUtils.copyProperties(bean, copyMesWorkOrder); - copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); + copyMesWorkOrder.setProductSeq((long) (productSeq + 1)); copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); @@ -178,11 +178,11 @@ public class MesWorkOrderService extends BaseMesService implements workOrderLogService.saveMesWorkOrderLog(copyMesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.INSERT,copyMesWorkOrder.getQty()); return bean; } else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + Long productSeq = 0L; + if (null != result && result.getProductSeq() != null) { + productSeq = (long) Math.toIntExact(result.getProductSeq()); } - bean.setProduceSeq(produceSeq + 1); + bean.setProductSeq(productSeq + 1); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); List resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel.organizeCode(bean.getOrganizeCode()), bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); bean.setWorkOrderSeq(resultList.get(0)); @@ -590,18 +590,18 @@ public class MesWorkOrderService extends BaseMesService implements DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(item.getWorkOrderStatus(), "workOrderStatus", orderPackBean); DdlPreparedPack.getStringEqualPack(item.getOrderFlag(), "orderFlag", orderPackBean); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"produceSeq"}, orderPackBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"productSeq"}, orderPackBean); MesWorkOrder result = baseRDao.getByProperty(orderPackBean); //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + Long productSeq = 0L; + if (null != result && result.getProductSeq() != null) { + productSeq = (long) Math.toIntExact(result.getProductSeq()); } MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); BeanUtils.copyProperties(item, copyMesWorkOrder); - copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); + copyMesWorkOrder.setProductSeq(productSeq + 1); copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, item.getCreateUser()); index++; @@ -616,11 +616,11 @@ public class MesWorkOrderService extends BaseMesService implements continue; } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { - Long produceSeq = 0L; - if (null != result && result.getProduceSeq() != null) { - produceSeq = (long) Math.toIntExact(result.getProduceSeq()); + Long productSeq = 0L; + if (null != result && result.getProductSeq() != null) { + productSeq = (long) Math.toIntExact(result.getProductSeq()); } - item.setProduceSeq(produceSeq + 1); + item.setProductSeq(productSeq + 1); item.setWorkOrderSeq(seqList.get(index)); } item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); 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 bfb43a8..efa4d40 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 @@ -482,7 +482,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { prodSeqSerialNoModel.setProdLocation(mesWorkOrder.getWorkCenterCode()); List proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList(); String proSeqStr = proSeqResultList.get(0); - mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", ""))); + mesWorkOrder.setProductSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", ""))); mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName()); ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB"); mesWorkOrderRao.insert(mesWorkOrder); @@ -525,7 +525,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { mesQueueOrder.setProductSn(mesWorkOrder.getWorkOrderNo()); mesQueueOrder.setCustSn(mesWorkOrder.getCustSn()); mesQueueOrder.setStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); - mesQueueOrder.setProduceSeq(mesWorkOrder.getProduceSeq()); + mesQueueOrder.setProductSeq(mesWorkOrder.getProductSeq()); mesQueueOrder.setWorkOrderSeq(mesWorkOrder.getWorkOrderSeq()); mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo()); mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java index 567d3c4..c33db46 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java @@ -136,7 +136,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { proSeqGenSerialNoModel.setDynamicRule("#"); List seqList = syncFuncService.syncSerialNo(proSeqGenSerialNoModel.organizeCode(detail.getOrganizeCode()), "edi", detail.getOrganizeCode(), 1).getResultList(); String prodSeqStr = seqList.get(0); - mesWorkOrder.setProduceSeq(Long.parseLong(prodSeqStr.substring(prodSeqStr.indexOf("#")+1))); + mesWorkOrder.setProductSeq(Long.parseLong(prodSeqStr.substring(prodSeqStr.indexOf("#")+1))); mesWorkOrder.setCustPartNo(sortInfos.get(0).getCustPartNo()); //标识 -空 //状态 --- 根据零件发运组看是自动发布