From 2aef1f2e7ba5ba9bac84f92439ca8076a81403d2 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 29 Sep 2024 18:03:03 +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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 f0058d3..7636852 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 @@ -91,6 +91,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { @Autowired private MesWorkOrderService mesWorkOrderService; + @Autowired + private MesWorkCenterRepository workCenterRao; + @Override public void execute(MesPartProdGroup partProdGroup, List sortInfoList, List details) { try { @@ -195,6 +198,13 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { mesWorkOrder.setWorkOrderSeq(sortInfo.getCustInfoSeq().toString()); mesWorkOrder.setOrganizeCode(sortInfo.getOrganizeCode()); mesWorkOrder.setWorkCenterCode(partProdGroup.getWorkCenterCode()); + //根据产线查找区域代码 + DdlPackBean centerPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(partProdGroup.getWorkCenterCode(),"workCenterCode", centerPackBean); + List workCenterList = workCenterRao.findByHqlTopWhere(centerPackBean, 1); + if (!workCenterList.isEmpty()){ + mesWorkOrder.setAreaCode(workCenterList.get(0).getAreaCode()); + } mesWorkOrder.setWorkCellCode(mesPartProdGroupDetail.getWorkCellCode()); //来源 @@ -470,6 +480,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()); orderAssembly.setOrganizeCode(organizeCode); orderAssembly.setProductSn(mesWorkOrder.getWorkOrderNo()); + orderAssembly.setAreaCode(mesWorkOrder.getAreaCode()); ConvertBean.saveOrUpdate(orderAssembly, "MES-JOB"); } workOrderAssemblyRao.saveAll(assemblyList); @@ -496,6 +507,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo()); mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo()); mesQueueOrder.setWorkCenterCode(mesWorkOrder.getWorkCenterCode()); + mesQueueOrder.setAreaCode(mesWorkOrder.getAreaCode()); ConvertBean.saveOrUpdate(mesQueueOrder, "MES-JOB"); queueOrderRao.insert(mesQueueOrder); } @@ -522,6 +534,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()); mesProduceSn.setSnType(MesExtEnumUtil.PRODUCE_SN_TYPE.STANDARD.getValue()); mesProduceSn.setFid(UUID.randomUUID().toString()); + mesProduceSn.setAreaCode(mesWorkOrder.getAreaCode()); ConvertBean.saveOrUpdate(mesProduceSn, "MES-JOB"); mesProduceSnRao.insert(mesProduceSn);