From c6eb3bac25a70318b36d612d58561225954e64e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sat, 11 May 2024 09:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesPartTypeDefectService.java | 2 +- .../mes/api/base/IMesPartTypePictureService.java | 2 +- .../base/IMesShippingOrderManagementService.java | 5 +++ .../base/MesPartTypeDefectController.java | 7 +-- .../base/MesShippingOrderManagementController.java | 37 +++++++++++++++- .../base/MesDefectAlarmConfigService.java | 2 +- .../serviceimpl/base/MesPartTypeDefectService.java | 12 ++--- .../base/MesPartTypePictureService.java | 13 ++---- .../base/MesShippingOrderManagementService.java | 51 +++++++++++++++++----- 9 files changed, 94 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java index c241693..bd7522d 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.ext.mes.api.base; +package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect; diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java index f99a11a..246b604 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.ext.mes.api.base; +package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture; 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 3452557..aa64eb0 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; /** * @Description: @@ -9,5 +11,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; */ public interface IMesShippingOrderManagementService extends IBaseMesService { + @ApiOperation(value = "发运", notes = "发运") + public void saveShipping(MesShippingOrderManagement shippingOrderManagement); + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java index 37a26f6..ce8d674 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect; @@ -6,11 +6,8 @@ import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * 零件类型缺陷类型对应关系 - */ @Api("零件类型缺陷类型对应关系") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartTypeDefect") public class MesPartTypeDefectController extends BaseMesController { -} +} \ No newline at end of file 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 3b55d79..70b8514 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 @@ -1,9 +1,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentCheckDetail; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,4 +24,29 @@ import org.springframework.web.bind.annotation.RestController; public class MesShippingOrderManagementController extends BaseMesController { + @Autowired + private IMesShippingOrderManagementService shippingOrderManagementService; + + @PostMapping(value = "/shipping") + @ApiOperation(value = "发运") + public ResultBean saveShipping(@RequestBody MesShippingOrderManagement bean) { + try { +// validateInsert(bean); + //新增初始化 + bean.setOrganizeCode("2031"); +// bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); +// ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); +// T t = (T) getBaseService().insert(bean); + shippingOrderManagementService.saveShipping(bean); +// afterInsert(t); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(bean); + } 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/MesDefectAlarmConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java index 130ffed..b923e96 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java @@ -27,7 +27,7 @@ public class MesDefectAlarmConfigService extends BaseMesService implements IMesPartTypeDefectService { - -// protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) { -// DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean); -// DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean); -// DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean); -// } +public class MesPartTypeDefectService extends BaseMesService implements IBaseMesService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java index ce7ddd5..934d899 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java @@ -1,18 +1,13 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypePictureService; +import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService; import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j -public class MesPartTypePictureService extends BaseMesService implements IMesPartTypePictureService { +public class MesPartTypePictureService extends BaseMesService implements IBaseMesService { -// protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) { -// DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean); -// DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean); -// DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean); -// } -} +} \ No newline at end of file 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 d3679e3..3a27f8d 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 @@ -4,13 +4,12 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.tool.TimeTool; 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.MesPartShippingGroup; -import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail; -import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; -import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail; +import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -38,11 +37,14 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); + + List jisShippingList = new ArrayList<>(); + detailDeleteList.forEach(k -> { + MesJisShipping jisShipping = new MesJisShipping(); + BeanUtils.copyProperties(originBean, jisShipping, "id"); + BeanUtils.copyProperties(k, jisShipping, "id"); + jisShipping.setFactoryCode(originBean.getCustPlantCode()); + jisShipping.setShippingTime(TimeTool.getNowTime(true)); + jisShipping.setDock(originBean.getSendDockCode()); + jisShipping.setCusDock(originBean.getCustDockCode()); + jisShipping.setCustOrderNo(k.getCustOrderNo()); + jisShipping.setSerialNumber(k.getBarcode()); + jisShipping.setQuantityPerCar(detailDeleteList.size()); + jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); + ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); + jisShippingList.add(jisShipping); + }); + + jisShippingRepository.saveAll(jisShippingList); + + } }