From 0fbb2cf76bc156c01b9a4f4a7b739e0e4850ec18 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 2 Jul 2024 17:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=B1=87=E6=80=BB=E3=80=81?= =?UTF-8?q?=E6=9D=BF=E6=9D=90=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderServiceImpl.java | 26 ++++++++++-------- .../mapper/orderParts/OrderPartsMapper.xml | 7 +++-- .../resources/type/生产单新增Excel模板.xlsx | Bin 29001 -> 28999 bytes .../admin/plate/PlateController.java | 12 ++++---- .../plate/vo/plate/PlateImportExcelVO.java | 1 - .../admin/plate/vo/plate/PlateSaveReqVO.java | 1 - .../service/plate/PlateServiceImpl.java | 8 +++++- 7 files changed, 31 insertions(+), 24 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index e0a2f6e6c..27529d237 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -211,7 +211,7 @@ public class OrderServiceImpl implements OrderService { orderProcessMapper.updateOrderDeleted(orderId, OrderDeletedEnum.NOT_DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); processStepMapper.updateOrderDeleted(orderId, OrderDeletedEnum.NOT_DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - if (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus() ) { + if (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus()) { if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); } @@ -256,6 +256,7 @@ public class OrderServiceImpl implements OrderService { return index; } + @Override public List getOrderBody(Long orderId) { // 判断生产单是否删除 @@ -307,7 +308,7 @@ public class OrderServiceImpl implements OrderService { // 判断生产单是否删除 (包含判断存在） Integer deleted = getOrderDeleted(orderId); List orderDetail = orderItemMapper.selectPartsDetailByOrderId(orderId, roomId, bodyId, name, - SecurityFrameworkUtils.getLoginUser().getOrganId(),deleted); + SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted); return orderDetail; } @@ -335,17 +336,17 @@ public class OrderServiceImpl implements OrderService { plateMapper.updateDeletedById(plateDOList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); // 删除大板 List goodsIdList = plateMapper.selectPlateGoodsListByList(plateDOList, orderId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - Map> goodsIdMap = goodsIdList.stream().collect(Collectors.groupingBy(PlateGoodsIdVO::getGoodsId)); + Map> goodsIdMap = goodsIdList.stream().collect(Collectors.groupingBy(PlateGoodsIdVO::getGoodsId)); List goodsIdDeleted = new ArrayList<>(); - goodsIdMap.forEach((k,v)->{ - for(int i=0;i { + for (int i = 0; i < v.size(); i++) { + if (v.get(i).getDeleted() == OrderDeletedEnum.NOT_DELETED.getStatus()) { break; } } goodsIdDeleted.add(k); }); - if (goodsIdDeleted.size()>0){ + if (goodsIdDeleted.size() > 0) { goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); } List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); @@ -353,7 +354,7 @@ public class OrderServiceImpl implements OrderService { }); } // 生产单柜体数量判断 - if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(),OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { + if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { orderMapper.updateOrderStatus(orderId, OrderStatusEnum.EMPTY.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); } } @@ -410,7 +411,7 @@ public class OrderServiceImpl implements OrderService { PlateGoodDO plateGoodDO; if (goodsDO.getGoodsId() != null) { // 有goodsId plateGoodDO = plateGoodMapper.selectGoodOne(goodsDO.getGoodsId(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - }else { // 没有goodsId 其他信息匹配 + } else { // 没有goodsId 其他信息匹配 plateGoodDO = plateGoodMapper.selectGood(goodsDO.getGoodsName(), goodsDO.getMaterial(), goodsDO.getColor(), goodsDO.getTexture(), goodsDO.getWidth(), goodsDO.getWidth(), goodsDO.getHeight(), goodsDO.getSpec(), goodsDO.getBrand(), SecurityFrameworkUtils.getLoginUser().getOrganId()); @@ -419,7 +420,7 @@ public class OrderServiceImpl implements OrderService { if (plateGoodDO != null) {//存在板材 goodsDO.setGoodsId(plateGoodDO.getGoodsId()); break; - }else { // 不存在板材 + } else { // 不存在板材 Long plateGoods = (Long) identifierGenerator.nextId(null); Long goodsId = (Long) identifierGenerator.nextId(null); plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class) @@ -428,7 +429,7 @@ public class OrderServiceImpl implements OrderService { // 判断是否存在raw_goods_id if (goodsDO.getGoodsId() != null) { plateGoodDO.setGoodsId(goodsDO.getGoodsId()); - }else { + } else { goodsDO.setGoodsId(plateGoodDO.getGoodsId()); } plateGoodLists.add(plateGoodDO); @@ -509,6 +510,7 @@ public class OrderServiceImpl implements OrderService { } return true; } + // 业务员是否存在 private void validateSalesmanOrderNoExists(String salesman, Long organId) { if (adminUserApi.validateUser(salesman, organId).getData() == null) { @@ -654,7 +656,7 @@ public class OrderServiceImpl implements OrderService { } // 根据ype 与 orderId获取相关信息 - public Map getDataByOrderIdAndType(OrderDO orderDO, String type,Integer deleted) { + public Map getDataByOrderIdAndType(OrderDO orderDO, String type, Integer deleted) { Map map = new HashMap<>(); map.put("orderDO", orderDO); switch (type) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml index 3f7241f3a..15642482b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml @@ -46,15 +46,15 @@ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx index 2a663c272cc3ceebe4c778f4fb3758409c47d353..792dd801dc38eff0eeb8179de0a79a15518fc0b2 100644 GIT binary patch delta 12802 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 diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java index 1ea2c327e..40c252087 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java @@ -33,7 +33,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -@Tag(name = "管理后台 - 板材信息表 plate") +@Tag(name = "管理后台 - 板材库管理") @RestController @RequestMapping("/manage/plate") @Validated @@ -43,7 +43,7 @@ public class PlateController { private PlateService plateService; @PostMapping("/create") - @Operation(summary = "创建板材信息表 plate_{N}") + @Operation(summary = "创建板材信息") // @PreAuthorize("@ss.hasPermission('manage:plate:create')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:create','base:plate:create')") public CommonResult createPlate(@Valid @RequestBody PlateSaveReqVO createReqVO) { @@ -51,7 +51,7 @@ public class PlateController { } @PutMapping("/update") - @Operation(summary = "更新板材信息表 plate_{N}") + @Operation(summary = "更新板材信息") // @PreAuthorize("@ss.hasPermission('manage:plate:update')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')") public CommonResult updatePlate(@Valid @RequestBody PlateSaveReqVO updateReqVO) { @@ -60,7 +60,7 @@ public class PlateController { } @DeleteMapping("/delete") - @Operation(summary = "删除板材信息表 plate_{N}") + @Operation(summary = "删除板材信息") @Parameters({ @Parameter(name = "id", description = "编号", required = true), @Parameter(name = "organId", description = "板材所属组织ID") @@ -74,7 +74,7 @@ public class PlateController { } @GetMapping("/get") - @Operation(summary = "获得板材信息表 plate_{N}") + @Operation(summary = "获得板材信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") // @PreAuthorize("@ss.hasPermission('manage:plate:query')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") @@ -84,7 +84,7 @@ public class PlateController { } @GetMapping("/page") - @Operation(summary = "获得板材信息表 plate_{N}分页") + @Operation(summary = "获得板材信息分页") // @PreAuthorize("@ss.hasPermission('manage:plate:query')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") public CommonResult> getPlatePage(@Valid PlatePageReqVO pageReqVO) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java index fa3fd8be7..823bb8329 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java @@ -37,7 +37,6 @@ public class PlateImportExcelVO { private String color; @ExcelProperty("纹理") - @NotEmpty(message = "纹路不能为空，填 有 无") private String texture; @ExcelProperty("宽度") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java index a76664703..7835c066a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java @@ -30,7 +30,6 @@ public class PlateSaveReqVO { private String color; @Schema(description = "纹理", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "纹理路不能为空") private Boolean texture; @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java index 2787e5c78..037a8b9a6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java @@ -3,6 +3,7 @@ package com.cf.imes.module.manage.service.plate; import cn.hutool.core.collection.CollUtil; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportRespVO; @@ -43,6 +44,7 @@ public class PlateServiceImpl implements PlateService { private OrganApi organApi; @Override + @OrganIgnore public Long createPlate(PlateSaveReqVO createReqVO) { PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class); if (createReqVO.getOrganId() != null && createReqVO.getOrganId() != 0 ){ @@ -62,6 +64,7 @@ public class PlateServiceImpl implements PlateService { } @Override + @OrganIgnore @Transactional(rollbackFor = Exception.class) public void updatePlate(PlateSaveReqVO updateReqVO) { // 更新 判断是否有组织id @@ -77,6 +80,7 @@ public class PlateServiceImpl implements PlateService { } @Override + @OrganIgnore @Transactional(rollbackFor = Exception.class) public void deletePlate(Long id,Long organId) { if (organId == null || organId == 0){ @@ -105,6 +109,7 @@ public class PlateServiceImpl implements PlateService { } @Override + @OrganIgnore public PageResult getPlatePage(PlatePageReqVO pageReqVO) { if (pageReqVO.getOrganId() == null || pageReqVO.getOrganId() == 0){ pageReqVO.setOrganId(OrganContextHolder.getOrganId()); @@ -114,9 +119,10 @@ public class PlateServiceImpl implements PlateService { @Override + @OrganIgnore @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入 public PlateImportRespVO importPlateList(List importPlates, boolean isUpdateSupport , Long organId) { - System.out.println(" importPlates " + importPlates); +// System.out.println(" importPlates " + importPlates); // if (CollUtil.isEmpty(importPlates)) { // throw ServiceExceptionUtil.exception(ErrorCodeConstants.PLATE_IMPORT_LIST_IS_EMPTY); // }