From df7c69878ae4376249cf66d7eca851e4c0afa82e Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 14 Oct 2024 10:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E5=AD=90=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E6=98=8E=E7=BB=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoimpl/MesShippingOrderManagementDetailDaoImpl.java | 8 +++++--- .../serviceimpl/base/MesShippingOrderManagementDetailService.java | 1 - 2 files changed, 5 insertions(+), 4 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 314bbe8..7447201 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 @@ -202,7 +202,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " from mes_shipping_detail sd " + " 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 "); + " and sd.bar_code != '' and sd.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 "); @@ -229,7 +229,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde Object[] cells = (Object[]) result; MesShippingOrderManagementDetail model = new MesShippingOrderManagementDetail(); model.setBarcode(StringUtils.isEmpty(cells[0]) ? "" : String.valueOf(cells[0])); - model.setPlanQty(StringUtils.isEmpty(cells[1]) ? 1 : Integer.parseInt(String.valueOf(cells[1]))); + model.setPlanQty(StringUtils.isEmpty(cells[1]) ? 1 : Double.parseDouble(String.valueOf(cells[1]))); model.setActualQty(StringUtils.isEmpty(cells[2]) ? 1 : Integer.parseInt(String.valueOf(cells[2]))); model.setShippingCode(StringUtils.isEmpty(cells[3]) ? "" : String.valueOf(cells[3])); model.setPartNo(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4])); @@ -285,7 +285,8 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " wop.part_no, " + " wop.part_name, " + " wop.item_qty, " + - " wo.shipping_time " + + " wo.shipping_time, " + + " wop.mes_work_order " + " from mes_work_order_part wop " + " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " ); hql.append(" WHERE wop.organize_code = :organizeCode "); @@ -325,6 +326,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde model.setPartName(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2])); model.setItemQty(StringUtils.isEmpty(cells[3]) ? 1 : Double.parseDouble(String.valueOf(cells[3]))); model.setShippingTime(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4])); + model.setWorkOrderNo(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5])); modelList.add(model); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java index f48e606..e7875b0 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java @@ -121,7 +121,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService