diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 1934a12b9..94f81333b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -75,6 +75,7 @@ public interface GoodsMapper extends BaseMapperX { // 删板材，批量 void updateDeletedById(@Param("ids") List ids, @Param("deleted") Integer deleted, @Param("organId") Long organId); + void deletedById(@Param("ids") List ids, @Param("organId") Long organId); IPage selectGoods(@Param("page") IPage page,@Param("goodsIds") List goodsIds,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java index 906c652bc..a813a9199 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java @@ -53,6 +53,12 @@ public interface OrderBodyMapper extends BaseMapperX { .eq(OrderBodyDO::getId, id) .eq(OrderBodyDO::getOrganId, organId)); } + default int deletedById(Long id, Long organId) { + return delete(new LambdaUpdateWrapper() + .eq(OrderBodyDO::getId, id) + .eq(OrderBodyDO::getOrganId, organId)); + } + // 控制是否删除，进行查询 default List selectList(Long orderId, Integer deleted, Long organId) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java index 2d2f2be8a..b94f2bdd2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java @@ -43,4 +43,9 @@ public interface OrderGroupMapper extends BaseMapperX { .eq(OrderGroupDO::getBodyId, id) .eq(OrderGroupDO::getOrganId, organId)); } + default int deletedById(Long id, Long organId) { + return delete(new LambdaUpdateWrapper() + .eq(OrderGroupDO::getBodyId, id) + .eq(OrderGroupDO::getOrganId, organId)); + } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index e1498c212..1a84cfe75 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -27,13 +27,13 @@ import java.util.List; @Mapper public interface OrderItemMapper extends BaseMapperX { - List selectPlatesDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId , - @Param("bodyId")Long bodyId , @Param("groupId")Long groupId , - @Param("groupName")String groupName, @Param("organId") Long organId, + List selectPlatesDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId, + @Param("bodyId") Long bodyId, @Param("groupId") Long groupId, + @Param("groupName") String groupName, @Param("organId") Long organId, @Param("deleted") Integer deleted); - List selectPartsDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId , - @Param("bodyId")Long bodyId , @Param("name")String name, + List selectPartsDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId, + @Param("bodyId") Long bodyId, @Param("name") String name, @Param("organId") Long organId, @Param("deleted") Integer deleted); @@ -42,15 +42,21 @@ public interface OrderItemMapper extends BaseMapperX { @Param("deleted") Integer deleted); - List selectPlateList( @Param("reqVO") PlateDetailReqVO reqVO,@Param("organId") Long organId); + List selectPlateList(@Param("reqVO") PlateDetailReqVO reqVO, @Param("organId") Long organId); - PlateDetailRespVO selectPlateNumList(@Param("orderId") Long orderId,@Param("organId") Long organId); + PlateDetailRespVO selectPlateNumList(@Param("orderId") Long orderId, @Param("organId") Long organId); - void deleteByPlateId(@Param("deletePlateIds") List deletePlateIds); + void deleteByPlateId(@Param("deletePlateIds") List deletePlateIds); - List selectPackList(@Param("orderIds") List orderIds,@Param("organId") Long organId); + List selectPackList(@Param("orderIds") List orderIds, @Param("organId") Long organId); + + default int deleteByBodyId(Long bodyId, Long organId) { + return delete(new LambdaQueryWrapperX() + .eq(OrderItemDO::getBodyId, bodyId) + .eq(OrderItemDO::getOrganId, organId)); + } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java index 53d0baa94..0bfa72bfe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java @@ -64,6 +64,7 @@ public interface OrderPartsMapper extends BaseMapperX { } void updateDeletedById(@Param("partsIds") List partsIds, @Param("deleted") Integer deleted, @Param("organId") Long organId); + void deletedById(@Param("partsIds") List partsIds, @Param("organId") Long organId); List selectPartList( @Param("orderIds") List orderIds,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 0756362e1..e8e60e3f5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -133,5 +133,6 @@ public interface PlateMapper extends BaseMapperX { List selectOrderIds(@Param("orderIds") List orderIds,@Param("organId") Long organId); + void deletedById(@Param("plateIds") List plateIds, @Param("organId") Long organId); } \ No newline at end of file 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 04138fc89..026b811aa 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 @@ -219,11 +219,11 @@ 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 (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { - orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - } - } +// 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()); +// } +// } } @@ -264,6 +264,7 @@ public class OrderServiceImpl implements OrderService { return index; } + @Override public List getOrderBody(Long orderId) { // 判断生产单是否删除 @@ -326,7 +327,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; } @@ -343,36 +344,43 @@ public class OrderServiceImpl implements OrderService { bodyIds.forEach(bodyId -> { // 校验存在 validateOrderBodyExists(orderId, bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - // 删除 - // orderBodyMapper.deleteAllByOrderId(orderId, bodyId); 物理删除 - orderBodyMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - orderGroupMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + // 物理删除 +// orderBodyMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderBodyMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 柜体 +// orderGroupMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderGroupMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 加工组 + // 先查再改 List plateDOList = plateMapper.selectPlateIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - // 删除小板 + // (删除小板) 小板变为删除状态 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){ - goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + if (goodsIdDeleted.size() > 0) { +// goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + goodsMapper.deletedById(goodsIdDeleted, SecurityFrameworkUtils.getLoginUser().getOrganId()); + } - List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 配件 +// orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderPartsMapper.deletedById(partsList, SecurityFrameworkUtils.getLoginUser().getOrganId()); + plateMapper.deletedById(plateDOList, SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderItemMapper.deleteByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); }); } // 生产单柜体数量判断 - 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()); } } @@ -429,7 +437,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()); @@ -438,7 +446,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) @@ -447,7 +455,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); @@ -528,6 +536,7 @@ public class OrderServiceImpl implements OrderService { } return true; } + // 业务员是否存在 private void validateSalesmanOrderNoExists(String salesman, Long organId) { if (adminUserApi.validateUser(salesman, organId).getData() == null) { @@ -673,7 +682,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/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index ccf31d04b..215cf82f0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -52,7 +52,14 @@ AND organ_id = #{organId} - + + DELETE FROM order_goods + WHERE id IN + + #{id} + + AND organ_id = #{organId} + SELECT DISTINCT - a.id, +-- a.id, a.name, a.brand, a.model, a.spec, a.unit, - a.price, +-- a.price, a.remark, - b.num + SUM(b.num) AS num FROM order_parts a LEFT JOIN @@ -63,6 +63,7 @@ b.order_id = #{orderId} AND b.organ_id = #{organId} AND a.deleted = #{deleted} + GROUP BY a.name, a.brand, a.model, a.spec, a.unit, a.remark @@ -74,7 +75,14 @@ #{partsId} AND organ_id = #{organId} - + + DELETE FROM order_parts + WHERE id IN + + #{partsId} + + AND organ_id = #{organId} + SELECT count(*) FROM order_plate WHERE order_id = #{orderId} AND organ_id = #{organId} AND deleted = #{deleted} 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 2a663c272..792dd801d 100644 Binary files a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx and b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx differ 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); // }