预打包相关接口

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java

@@ -6,8 +6,10 @@ import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource;
 import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.SavePlanPlateResultReqVO;
 import com.cf.imes.module.executor.controller.admin.plan.vo.*;
 import com.cf.imes.module.executor.controller.admin.plate.vo.PlateSaveReqVO;
+import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO;
 import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -97,4 +99,17 @@ public class OptimizePlanController {
 
     }
 
+
+    @GetMapping("/getPlateModel")
+    @Operation(summary = "查询当前生产单的板材造型信息")
+    @Parameter(name = "orderId", description = "生产单Id", required = true)
+    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
+    public CommonResult<List<OrderModelDO>> getPlateModel (@Valid @RequestParam("orderId") Long orderId) {
+
+        return success(optimizePlanService.getPlateModel(orderId));
+
+    }
+
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java

@@ -142,4 +142,15 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
 //    List<OrderGoodsPlateRespVO> selectPlateAnalysisListByArea(@Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 面积
     IPage<OrderGoodsPlateRespVO> selectPlateAnalysisListByArea(@Param("page") IPage<OrderGoodsPlateRespVO> page, @Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 面积
 
+
+    default List<PlateDO> selectPlateNum(Long orderId, Long organId) {
+        return selectList(new LambdaQueryWrapperX<PlateDO>()
+                .eq(PlateDO::getOrganId,organId)
+                .eqIfPresent(PlateDO::getOrderId, orderId));
+
+
+    }
+
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java

@@ -3,6 +3,7 @@ package com.cf.imes.module.executor.service.optimizeplan;
 import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource;
 import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.SavePlanPlateResultReqVO;
 import com.cf.imes.module.executor.controller.admin.plan.vo.*;
+import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO;
 
 import java.util.List;
 import java.util.Map;
@@ -39,5 +40,5 @@ public interface OptimizePlanService {
     void saveOptimizationResults(SavePlanPlateResultReqVO req);
 
 
-
+    List<OrderModelDO> getPlateModel(Long orderId);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -673,6 +673,16 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
     }
 
+    @Override
+    public List<OrderModelDO> getPlateModel(Long orderId) {
+
+        List<PlateDO> plateDOS = plateMapper.selectPlateNum(orderId, getUserOrganId());
+
+
+        return buildRespByOrderId(orderId, ORDER_PLATE_MODEL,plateDOS.size());
+
+    }
+
 
     private List<OrderModelDO> buildRespByOrderIds(Collection<Long> orderIds, String index, Integer size) {
         List<FieldValue> fieldValues = orderIds.stream().map(FieldValue::of).toList();