From 9e812fdd51dc27f9530357b745440d4a6ff32b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Tue, 28 May 2024 21:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E8=BD=A6=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoimpl/MesLoadingListDetailDaoImpl.java | 5 +---- .../serviceimpl/base/MesLoadingListService.java | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java index e05a40f..daa5d35 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java @@ -37,8 +37,7 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao { StringBuffer hql = new StringBuffer("select mll.order_code ,mll.cust_name ,mll.cust_organize_name ,mll.shipping_group_name , "); hql.append(" mlld.status , mll.truck_no ,mll.weather , ms.shipping_code ,ms.start_scan_time ,ms.end_scan_time ,ms.status as shipStatus , "); hql.append(" mlld.create_date_time , mll.create_user ,mll.modify_date_time , ms.modify_user , "); - hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code , "); - hql.append(" ms.start_scan_time ,ms.end_scan_time "); + hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code "); hql.append(" from mes_loading_list as mll"); hql.append(" inner join mes_loading_list_detail as mlld on mll.id = mlld.pid"); hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid "); @@ -95,8 +94,6 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao { model.setCustCode(StringUtils.isEmpty(cells[15]) ? "" : String.valueOf(cells[15])); model.setCustOrganizeCode(StringUtils.isEmpty(cells[16]) ? "" : String.valueOf(cells[16])); model.setShippingGroupCode(StringUtils.isEmpty(cells[17]) ? "" : String.valueOf(cells[17])); - model.setStartScanTime(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18])); - model.setEndScanTime(StringUtils.isEmpty(cells[19]) ? "" : String.valueOf(cells[19])); modelList.add(model); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java index b1046cf..aa92174 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java @@ -209,16 +209,17 @@ public class MesLoadingListService extends BaseMesService implem .build(); } - DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getOrderCode(), "orderCode", partPackBean); - boolean flg = baseRDao.isExitByHql(partPackBean); - if (flg) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("装车单【%s】已经存在，请检查数据", item.getOrderCode()) - .build(); - } +// DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); +// DdlPreparedPack.getStringEqualPack(item.getTruckNo(), "truckNo", partPackBean); +// DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue(), "status", partPackBean); +// boolean flg = baseRDao.isExitByHql(partPackBean); +// if (flg) { +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) +// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) +// .setErrorDetail("车牌号【%s】已经生成创建状态的装车单，请检查数据", item.getTruckNo()) +// .build(); +// } }