From b99c86e0b9631bddb65d8a4574f0a3138b5abfef Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 6 Nov 2024 10:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0vin=E5=8F=B7=E5=8D=A1?= =?UTF-8?q?=E6=8E=A7,=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesCreateWorkOrderImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index ffc2240..e1809d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -93,12 +93,18 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { String vinCode = sortInfo.getVinCode(); DdlPackBean existPackBean = DdlPackBean.getDdlPackBean(sortInfo.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(vinCode,"vinCode",existPackBean); - DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean); - int count = mesWorkOrderRao.findByHqlWhereCount(existPackBean); - if (count > 0) { - sortInfo.setDescription("当前vin号已存在S单!"); +// DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean); + List workOrderList = mesWorkOrderRao.findByHqlWhere(existPackBean); + if (!workOrderList.isEmpty()) { + MesWorkOrder mesWorkOrder = workOrderList.get(0); + if (mesWorkOrder.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue())) { + sortInfo.setDescription("当前vin号已存在S单!"); + return; + } + sortInfo.setDescription("当前vin号已经解析过!"); return; } + String organizeCode = partProdGroup.getOrganizeCode(); MesWorkOrder mesWorkOrder = new MesWorkOrder(); mesWorkOrder.setCustCode(partProdGroup.getCustCode());