From 709b21c08b24a97ea3eb3f33d3b629e95567db2c Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 10 Oct 2024 13:50:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesShippingOrderManagementDetailDaoImpl.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java index f2ccd98..5c24489 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java @@ -201,17 +201,26 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " sd.part_no, " + " sd.modify_date_time, " + " from mes_shipping_detail sd " + - " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " + + " left join mes_shipping s on s.id=sd.pid " + " WHERE sd.status in (20) " +//todo 发运 20 " and sd.bar_code != '' and bar_code is not NULL "); hql.append(" and sd.organize_code = :organizeCode "); hql.append(" and sd.is_deleted = :isDeleted "); hql.append(" and sd.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ - hql.append(" and sd.modify_date_time >= "+detail.getModifyDateTimeStart()+" "); + hql.append(" and sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' "); } if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ - hql.append(" and sd.modify_date_time <= "+detail.getModifyDateTimeEnd()+" "); + hql.append(" and sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' "); + } + if (!StringUtil.isEmpty(detail.getShippingCode())){ + hql.append(" and s.shipping_code = '"+detail.getShippingCode()+"' "); + } + if (!StringUtil.isEmpty(detail.getTotalPartNo())){ + hql.append(" and sd.part_no = '"+detail.getTotalPartNo()+"' "); + } + if (!StringUtil.isEmpty(detail.getWorkOrderNo())){ + hql.append(" and sd.bar_code like '"+detail.getWorkOrderNo()+"%' "); } Query query = entityManager.createNativeQuery(hql.toString()); @@ -247,10 +256,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and wop.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getPartNo())){ - hql.append(" and wop.part_no ="+detail.getPartNo()+" "); + hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ - hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); + hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' "); } hql.append(" and wop.work_order_no in (:codeList) "); @@ -285,10 +294,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and wop.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getPartNo())){ - hql.append(" and wop.part_no ="+detail.getPartNo()+" "); + hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ - hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); + hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' "); } hql.append(" and wop.work_order_no in (:codeList) "); From 98a6a8e5e86bc4d31518bfd0b4ca9c82e2024f17 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 10 Oct 2024 16:08:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E7=BB=84=E4=BA=A7=E7=BA=BF=E8=B7=9F=E5=B7=A5=E5=8D=95=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E4=B8=80=E8=87=B4=20=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=8B=89=E5=8A=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesPullingOrderInfoService.java | 130 +++++++++++---------- 1 file changed, 67 insertions(+), 63 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 90edeb7..6ebd6cf 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 @@ -169,11 +169,13 @@ public class MesPullingOrderInfoService extends BaseMesService> stringListEntryDetail : pullCodeListMap.entrySet()) { String pullCode = stringListEntryDetail.getKey(); List mesPartPulls = pullCodeMap.get(pullCode); - MesPartPull mesPartPull = mesPartPulls.get(0);//拉动组明细拉动单号对应拉动组 - List mesPartPullDetails = stringListEntryDetail.getValue(); - //拉动组号+年月日+工单后5位 - String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") + - mesWorkOrder.getWorkOrderNo().substring(mesWorkOrder.getWorkOrderNo().length()-5); + MesPartPull mesPartPull = mesPartPulls.get(0); + //拉动组明细拉动单号对应拉动组 如果拉动组产线跟工单产线不一致 不生成 + if (mesWorkOrder.getWorkCenterCode().equals(mesPartPull.getWorkCenterCode())){ + List mesPartPullDetails = stringListEntryDetail.getValue(); + //拉动组号+年月日+工单后5位 + String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") + + mesWorkOrder.getWorkOrderNo().substring(mesWorkOrder.getWorkOrderNo().length()-5); // if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.KITTING_PULL.getValue()) { // orderNo = "KITTING"; // } else if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.JIS_PULL.getValue()) { @@ -185,7 +187,7 @@ public class MesPullingOrderInfoService extends BaseMesService orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.MES_PULL_ORDER_NO); // if (orderResutlBean != null && orderResutlBean.isSuccess()) { // orderNo += orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString(); @@ -197,69 +199,71 @@ public class MesPullingOrderInfoService extends BaseMesService