From 4e5859f0423166c4e26480d22fa3716d4b954225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Thu, 23 May 2024 17:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/daoimpl/MesLoadingListDetailDaoImpl.java | 7 ++++++- .../ext/mes/pojo/model/MesLoadingListDetailModel.java | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 2 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 276a6f5..18413d0 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 @@ -35,7 +35,8 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao { public List queryLoadingListDetailModel(MesLoadingListDetail detail, Pager pager) { 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.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(" 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 "); @@ -79,6 +80,10 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao { model.setStartScanTime(StringUtils.isEmpty(cells[8]) ? "" : String.valueOf(cells[8])); model.setEndScanTime(StringUtils.isEmpty(cells[9]) ? "" : String.valueOf(cells[9])); model.setShippingStatus(StringUtils.isEmpty(cells[10]) ? 0 : Integer.parseInt(String.valueOf(cells[10]))); + model.setCreateDatetime(StringUtils.isEmpty(cells[11]) ? "" : String.valueOf(cells[11])); + model.setCreateUser(StringUtils.isEmpty(cells[12]) ? "" : String.valueOf(cells[12])); + model.setModifyDatetime(StringUtils.isEmpty(cells[13]) ? "" : String.valueOf(cells[13])); + model.setModifyUser(StringUtils.isEmpty(cells[14]) ? "" : String.valueOf(cells[14])); modelList.add(model); } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesLoadingListDetailModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesLoadingListDetailModel.java index 1c29189..12c4c1b 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesLoadingListDetailModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesLoadingListDetailModel.java @@ -23,7 +23,8 @@ public class MesLoadingListDetailModel { private String custOrganizeName; @ApiParam("发运组代码") - private String shippingGroupNo; + private String shippingGroupCode; + @ApiParam("发运组代码") private String shippingGroupName; @@ -49,4 +50,18 @@ public class MesLoadingListDetailModel { @ApiParam("发运状态") private Integer shippingStatus; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + }