From ad5974f98a906327ca59b5047b357c33ca95fe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Tue, 28 May 2024 18:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/IMesShippingOrderManagementService.java | 2 + .../base/MesShippingOrderManagementController.java | 33 ++-- .../serviceimpl/base/MesLoadingListService.java | 2 +- .../base/MesShippingOrderManagementService.java | 172 +++++---------------- 4 files changed, 62 insertions(+), 147 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementService.java index ec777a1..f7e578e 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementService.java @@ -15,6 +15,8 @@ public interface IMesShippingOrderManagementService extends IBaseMesService saveShippingClose(@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()); -// -// 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()) -// .build(); -// } //新增初始化 for (MesShippingOrderManagement orderManagement : beanList) { orderManagement.setOrganizeCode(AuthUtilExt.getOrganizeCode()); @@ -99,4 +86,24 @@ public class MesShippingOrderManagementController extends BaseMesController saveShippingRelease(@RequestBody List beanList) { + try { + + //新增初始化 + for (MesShippingOrderManagement orderManagement : beanList) { + orderManagement.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + shippingOrderManagementService.saveShippingRelease(orderManagement); + } + + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException e) { + return ResultBean.fail(e).build(); + } catch (Exception e) { + return ResultBean.fail(e); + } + } + } 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 9ca7111..1c2e677 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 @@ -175,7 +175,7 @@ public class MesLoadingListService extends BaseMesService implem List shippingOrderNoList = new ArrayList<>(); List listDetailByShippingCodeList = new ArrayList<>(); // 数据校验 - ValidatorBean.checkNotNull(item.getOrderCode(), "装车单号不能为空"); + ValidatorBean.checkNotNull(item.getTruckNo(), "车牌号不能为空"); ValidatorBean.checkNotNull(item.getWeather(), "天气不能为空"); ValidatorBean.checkNotNull(item.getShippingOrderNoList(), "发运单不能为空"); item.getShippingOrderNoList().forEach(k -> { 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 1df9552..2d50382 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 @@ -3,6 +3,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.IMesPartService; import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; +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; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -71,7 +72,6 @@ public class MesShippingOrderManagementService extends BaseMesService groupDetailList = shippingGroupDetailService.findAll(shipGroupPackBean); + if (CollectionUtils.isEmpty(groupDetailList)) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】零件发运组明细数据为空，请检查数据", bean.getShippingGroupCode()) + .build(); + } DdlPackBean custDockPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", custDockPackBean); @@ -125,6 +144,13 @@ public class MesShippingOrderManagementService extends BaseMesService groupDetailList = shippingGroupDetailService.findAll(shipGroupPackBean); - if (CollectionUtils.isEmpty(groupDetailList)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】零件发运组明细数据为空，请检查数据", bean.getShippingGroupCode()) - .build(); - } bean = baseRDao.insert(bean); @@ -159,7 +174,6 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); - detailDeleteList.forEach(k -> { - k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); - }); - //查询物料发运组数据 - DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(bean.getShippingGroupCode(), "shippingGroupCode", shipGroupPackBean); - List shippingGroupDetailList = shippingGroupDetailService.findAll(shipGroupPackBean); - if (CollectionUtils.isEmpty(shippingGroupDetailList)) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】发运组明细数据为空，请检查数据", bean.getShippingGroupCode()) - .build(); - } - //发运单明细 - List detailInsertList = new ArrayList<>(); - shippingGroupDetailList.forEach(k -> { - MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail(); - BeanUtils.copyProperties(k, detail, "id"); - MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode()); - detail.setPartName(part.getPartName()); - detail.setUnit(part.getUnit()); - detail.setCustPartNo(k.getCustPartNo()); - detail.setPlanQty(1); - detail.setPid(originBean.getId()); - detail.setShippingCode(originBean.getShippingCode()); - detail.setOrganizeCode(k.getOrganizeCode()); - detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()); - - ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName()); - detailInsertList.add(detail); - }); - //软删原明细数据 - detailService.updates(detailDeleteList); - //新增新明细数据 - detailService.insertBatch(detailInsertList); - } - - ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName()); - baseRDao.update(bean); - return originBean; - } - - @Override public void deleteWeaklyByIds(Long[] ids, String userName) { @@ -321,7 +216,7 @@ public class MesShippingOrderManagementService extends BaseMesService