Merge remote-tracking branch 'origin/main'

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<GoodsDO> {
 
     // 删板材，批量
     void updateDeletedById(@Param("ids") List<Long> ids, @Param("deleted") Integer deleted, @Param("organId") Long organId);
+    void deletedById(@Param("ids") List<Long> ids, @Param("organId") Long organId);
 
 
     IPage<OrderGoodsResp> selectGoods(@Param("page") IPage page,@Param("goodsIds")  List<Long>  goodsIds,@Param("organId") Long organId);

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<OrderBodyDO> {
                 .eq(OrderBodyDO::getId, id)
                 .eq(OrderBodyDO::getOrganId, organId));
     }
+    default int deletedById(Long id, Long organId) {
+        return delete(new LambdaUpdateWrapper<OrderBodyDO>()
+                .eq(OrderBodyDO::getId, id)
+                .eq(OrderBodyDO::getOrganId, organId));
+    }
+
 
     // 控制是否删除，进行查询
     default List<OrderBodyDO> selectList(Long orderId, Integer deleted, Long organId) {

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<OrderGroupDO> {
                 .eq(OrderGroupDO::getBodyId, id)
                 .eq(OrderGroupDO::getOrganId, organId));
     }
+    default int deletedById(Long id, Long organId) {
+        return delete(new LambdaUpdateWrapper<OrderGroupDO>()
+                .eq(OrderGroupDO::getBodyId, id)
+                .eq(OrderGroupDO::getOrganId, organId));
+    }
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java

@@ -53,4 +53,10 @@ public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
 
     List<PrintOrderPackReqVO> selectPackList(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
 
+
+    default int deleteByBodyId(Long bodyId, Long organId) {
+        return delete(new LambdaQueryWrapperX<OrderItemDO>()
+                .eq(OrderItemDO::getBodyId, bodyId)
+                .eq(OrderItemDO::getOrganId, organId));
+    }
 }

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<OrderPartsDO> {
     }
 
     void updateDeletedById(@Param("partsIds") List<Long> partsIds, @Param("deleted") Integer deleted, @Param("organId") Long organId);
+    void deletedById(@Param("partsIds") List<Long> partsIds, @Param("organId") Long organId);
 
     List<PrintOrderPartsRespVO> selectPartList( @Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 

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<PlateDO> {
     List<OrderIds> selectOrderIds(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 
 
+    void deletedById(@Param("plateIds") List<Long> plateIds, @Param("organId") Long organId);
 
 }

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 (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus()) {
-            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.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+//                orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
-            }
+//            }
-        }
+//        }
 
     }
 
@@ -264,6 +264,7 @@ public class OrderServiceImpl implements OrderService {
 
         return index;
     }
+
     @Override
     public List<OrderBodyRespVO> getOrderBody(Long orderId) {
         // 判断生产单是否删除
@@ -343,14 +344,16 @@ 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());
-                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.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+                orderGroupMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 加工组
+
 
                 // 先查再改
                 List<Long> plateDOList = plateMapper.selectPlateIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId());
-                // 删除小板
+                // (删除小板) 小板变为删除状态
                 plateMapper.updateDeletedById(plateDOList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
                 // 删除大板
                 List<PlateGoodsIdVO> goodsIdList = plateMapper.selectPlateGoodsListByList(plateDOList, orderId, SecurityFrameworkUtils.getLoginUser().getOrganId());
@@ -365,10 +368,15 @@ public class OrderServiceImpl implements OrderService {
                     goodsIdDeleted.add(k);
                 });
                 if (goodsIdDeleted.size() > 0) {
-                    goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+//                    goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+                    goodsMapper.deletedById(goodsIdDeleted, SecurityFrameworkUtils.getLoginUser().getOrganId());
+
                 }
-                List<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId());
+                List<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 配件
-                orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), 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());
             });
         }
         // 生产单柜体数量判断
@@ -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) {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -52,7 +52,14 @@
         </foreach>
           AND organ_id = #{organId}
     </update>
-
+    <delete id="deletedById">
+        DELETE FROM order_goods
+        WHERE id IN
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        AND organ_id = #{organId}
+    </delete>
 
 
     <select id="selectGoods" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderGoodsResp" parameterType="map">

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml

@@ -46,15 +46,15 @@
     <select id="selectPartAll"
             resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.PartGoodsRespVO">
         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
     </select>
 
 
@@ -74,7 +75,14 @@
                 #{partsId}
               </foreach>AND organ_id = #{organId}
     </update>
-
+    <delete id="deletedById">
+        DELETE FROM order_parts
+        WHERE id IN
+        <foreach collection="partsIds" item="partsId" open="(" separator="," close=")">
+            #{partsId}
+        </foreach>
+            AND organ_id = #{organId}
+    </delete>
 
     <select id="selectPartList"
             resultType="com.cf.imes.module.executor.controller.admin.plan.saveOptimize.PrintOrderPartsRespVO">

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -278,6 +278,16 @@
         </foreach>
           AND organ_id = #{organId}
     </update>
+
+    <delete id="deletedById">
+        DELETE FROM order_plate
+        WHERE id IN
+        <foreach collection="plateIds" item="plateId" open="(" separator="," close=")">
+            #{plateId}
+        </foreach>
+        AND organ_id = #{organId}
+    </delete>
+
     <select id="countPlateByOrderId" resultType="java.lang.Integer">
         SELECT count(*) FROM order_plate
         WHERE order_id = #{orderId} AND organ_id = #{organId} AND deleted = #{deleted}

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<Long> 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<Boolean> 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<PageResult<PlateRespVO>> getPlatePage(@Valid PlatePageReqVO pageReqVO) {

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("宽度")

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)

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<PlateDO> 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<PlateImportExcelVO> 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);
 //        }