From 3e4b2a51725cf5b62dfbafff78eb71bce7b7285b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Tue, 28 May 2024 19:55:37 +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 --- .../mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java | 10 ++++------ .../mes/apiservice/serviceimpl/base/MesLoadingListService.java | 2 ++ .../serviceimpl/base/MesShippingOrderManagementService.java | 7 ++++--- 3 files changed, 10 insertions(+), 9 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 ef6035a..e05a40f 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,8 @@ 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 , ms.shipping_group_name , "); - hql.append(" mll.truck_no , ms.start_scan_time ,ms.end_scan_time "); + 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(" 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,10 +95,8 @@ 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.setShippingGroupName(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18])); - model.setTruckNo(StringUtils.isEmpty(cells[19]) ? "" : String.valueOf(cells[19])); - model.setStartScanTime(StringUtils.isEmpty(cells[20]) ? "" : String.valueOf(cells[20])); - model.setEndScanTime(StringUtils.isEmpty(cells[21]) ? "" : String.valueOf(cells[21])); + 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 1c2e677..b1046cf 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 @@ -110,6 +110,8 @@ public class MesLoadingListService extends BaseMesService implem // genSerialNoModel.setPartNo(bean.getPartNo()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); + bean.setPartShippingGroupCode(partShippingGroup.getShippingGroupCode()); + bean.setShippingGroupName(partShippingGroup.getShippingGroupName()); bean.setStatus(MesExtEnumUtil.LOADING_DETAIL_ORDER_STATUS.CREATE.getValue()); bean.setOrderCode(resultList.get(0)); bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 2d50382..8d788db 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -151,6 +151,7 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); Map> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo())); @@ -346,7 +347,7 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue()); @@ -354,7 +355,7 @@ public class MesShippingOrderManagementService extends BaseMesService { k.setActualQty(0); - k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue()); + k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue()); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); //若扫描过的条码 则恢复条码