From b77d89ecbfa68c73d4f34c1dbb38cbd9a5937073 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 19 Sep 2024 15:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8B=BE=E9=80=89=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E5=90=8C=E6=AD=A5WMS=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90=E5=8D=95=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E8=A3=85=E8=BD=A6=E5=8D=95=EF=BC=9B?= =?UTF-8?q?=20=E5=8F=91=E8=BF=90=E5=8D=95=E3=80=81=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E7=9A=84=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=96=87=E6=9C=AC=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A=E8=BE=93=E5=85=A5?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesLoadingListDetailService.java | 4 +++ .../ext/mes/api/base/IMesLoadingListService.java | 3 ++ .../base/MesShippingOrderManagementController.java | 8 ++---- .../base/MesEquipmentSpotCheckDetailService.java | 5 ++-- .../base/MesLoadingListDetailService.java | 13 +++++++++ .../serviceimpl/base/MesLoadingListService.java | 13 +++++++++ .../base/MesShippingOrderManagementService.java | 32 ++++++++++++++-------- 7 files changed, 58 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListDetailService.java index cf363d3..f86e5c8 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListDetailService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListDetailService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail; +import io.swagger.annotations.ApiOperation; /** * @Description: @@ -14,4 +15,7 @@ public interface IMesLoadingListDetailService extends IBaseMesService queryLoadingListDetail(MesLoadingListDetail detail, Pager pager); + @ApiOperation("根据发运单号查询装车单明细信息") + MesLoadingListDetail getMesLoadingListDetail(String organizeCode,String shippingCode); + } diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java index 71fa066..5f62aee 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; +import io.swagger.annotations.ApiOperation; /** * @Description: @@ -9,5 +10,7 @@ import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; */ public interface IMesLoadingListService extends IBaseMesService { + @ApiOperation("根据发运单号查询装车单信息") + MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java index c6dcdda..bd30121 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java @@ -38,17 +38,13 @@ public class MesShippingOrderManagementController extends BaseMesController saveShipping(@RequestBody List beanList) { try { - List orderNoList = - beanList.stream().filter(k -> k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && - k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()).map(k -> k.getShippingCode()).collect(Collectors.toList()); + List orderNoList = beanList.stream().filter(k -> k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()).map(MesShippingOrderManagement::getShippingCode).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(orderNoList)) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】发运单状态不是【%s】或【%s】，请选择状态为【%s】或【%s】的数据", orderNoList, MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getDescription(), - MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getDescription(), MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getDescription(), - MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getDescription()) + .setErrorDetail("【%s】发运单状态不是【%s】状态", orderNoList, MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getDescription()) .build(); } //新增初始化 diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java index b2e483e..a8ac4d0 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; @@ -157,8 +158,8 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService addressList = new ArrayList<>(); //查询设备变量信息 - List realAddress = beanList.stream().map(MesEquipmentSpotCheckDetail::getRealValueAddress).distinct().collect(Collectors.toList()); - List setAddress = beanList.stream().map(MesEquipmentSpotCheckDetail::getSetValueAddress).distinct().collect(Collectors.toList()); + List realAddress = beanList.stream().map(MesEquipmentSpotCheckDetail::getRealValueAddress).filter(t-> !StringUtils.isEmpty(t)).distinct().collect(Collectors.toList()); + List setAddress = beanList.stream().map(MesEquipmentSpotCheckDetail::getSetValueAddress).filter(t-> !StringUtils.isEmpty(t)).distinct().collect(Collectors.toList()); if (!CollectionUtils.isEmpty(realAddress)) addressList.addAll(realAddress); if (!CollectionUtils.isEmpty(setAddress)) addressList.addAll(setAddress); if (CollectionUtils.isEmpty(addressList)) return null; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListDetailService.java index cc2e2a9..e5b14b8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListDetailService.java @@ -3,13 +3,16 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListDetailService; import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesLoadingListDetailDao; import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.List; @@ -27,4 +30,14 @@ public class MesLoadingListDetailService extends BaseMesService list = detailDao.queryLoadingListDetailModel(detail, pager); return new ListPager<>(list, pager); } + + @Override + public MesLoadingListDetail getMesLoadingListDetail(String organizeCode, String shippingCode) { + if(StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(shippingCode)){ + return null; + } + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(shippingCode,"shippingCode",packBean); + return baseRDao.getByProperty(packBean); + } } 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 0ea2d74..ea283ff 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 @@ -30,6 +30,7 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Service @Slf4j @@ -230,5 +231,17 @@ public class MesLoadingListService extends BaseMesService implem DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getTruckNo(), "truckNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getRemark(), "remark", packBean); + } + + @Override + public MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode) { + MesLoadingListDetail mesLoadingListDetail = detailService.getMesLoadingListDetail(organizeCode,shippingCode); + if(Objects.isNull(mesLoadingListDetail)){ + return null; + } + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(mesLoadingListDetail.getPid(),"id",packBean); + return baseRDao.getByProperty(packBean); } } 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 b444aee..a803ccb 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; -import cn.estsh.i3plus.ext.mes.api.base.IMesPartSapService; -import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService; -import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; +import cn.estsh.i3plus.ext.mes.api.base.*; +import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; @@ -12,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail; import cn.estsh.i3plus.pojo.mes.repository.*; @@ -26,10 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; @Service @@ -65,12 +61,16 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); + if(CollectionUtils.isEmpty(detailDeleteList)){ + MesException.throwMesBusiException("发运单【%s】明细信息不存在",originBean.getShippingCode()); + } + Map> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getPartNo)); - Map> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo())); + //查询装车单 + MesLoadingList loadingList = mesLoadingListService.getMesLoadingListByShippingCode(originBean.getOrganizeCode(), originBean.getShippingCode()); List jisShippingList = new ArrayList<>(); MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(bean.getOrganizeCode(), originBean.getShippingGroupCode()); + String erpWarerhouse = mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE") : mesPartShippingGroup.getSrcWarerhouse(); + String erpWarehous = configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS"); + detailMap.forEach((k, v) -> { MesPartSap part = partService.getMesPartSapByPartNo(v.get(0).getPartNo(), bean.getOrganizeCode()); @@ -307,10 +315,10 @@ public class MesShippingOrderManagementService extends BaseMesService