多个订单查询板材，计件工资查询接口修改

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

@@ -22,11 +22,11 @@ public class PlateResList {
     private String plateName;
     @Schema(description = "商品颜色")
     private String color;
-    @Schema(description = "商品宽")
+    @Schema(description = "小板宽")
     private String width;
-    @Schema(description = "商品高")
+    @Schema(description = "小板高")
     private String height;
-    @Schema(description = "商品厚")
+    @Schema(description = "小板厚")
     private String thickness;
     @Schema(description = "是否异形")
     private Boolean isSpecialShaped;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java

@@ -2,6 +2,8 @@ package com.cf.imes.module.executor.dal.dataobject.process;
 
 import com.cf.imes.framework.organ.core.db.OrganBaseDO;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -50,7 +52,7 @@ public class OrderProcessDO extends BaseDO {
     /**
      * 板材大小
      */
-    private Double size;
+    private BigDecimal size;
     /**
      * 下一工序 ID
      */

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

@@ -1,5 +1,6 @@
 package com.cf.imes.module.executor.dal.mysql.plate;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -108,4 +109,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
     void updateDeletedById(@Param("bodyId") Long bodyId, @Param("deleted") Integer deleted, @Param("organId") Long organId);
 
     int countPlateByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);
+
+
+    BigDecimal selectPlateSize( @Param("orderId") Long orderId);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java

@@ -5,11 +5,13 @@ import com.cf.imes.framework.common.enums.ProcessProcessingTypeEnum;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO;
 import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO;
+import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO;
 import com.cf.imes.module.executor.dal.dataobject.processStep.ProcessStepDO;
 import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO;
 import com.cf.imes.module.executor.dal.mysql.order.OrderMapper;
 import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper;
 import com.cf.imes.module.executor.dal.mysql.orderGroup.OrderGroupMapper;
+import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper;
 import com.cf.imes.module.executor.dal.mysql.processStep.ProcessStepMapper;
 import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper;
 import com.cf.imes.module.executor.enums.OrderStatusEnum;
@@ -31,6 +33,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils;
 
 import com.cf.imes.module.executor.dal.mysql.process.OrderProcessMapper;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,6 +75,9 @@ public class OrderProcessServiceImpl implements OrderProcessService {
     @Resource
     private OrderBodyMapper orderBodyMapper;
 
+    @Resource
+    private PlateMapper plateMapper;
+
     private static Integer INDEX = 0;
 
     @Override
@@ -91,7 +97,11 @@ public class OrderProcessServiceImpl implements OrderProcessService {
         }
         // 插入
         Long orderProcessId = (Long) identifierGenerator.nextId(null);
-        OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId(orderProcessId);
+
+        // 查询当前订单对应的总板材大小
+        BigDecimal size = plateMapper.selectPlateSize(createReqVO.getOrderId());
+
+        OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId(orderProcessId).setSize(size);
 
 
         List<ProcessStepDO> processStepDOS = new ArrayList<>();

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

@@ -29,7 +29,7 @@
 
     <select id="selectPlateByPlanId"
             resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList">
-        select a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt, e.material, e.color, e.width, e.height, e.thickness, b.room_id, b.body_id
+        select a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
         from order_plate a
                  LEFT JOIN order_item b ON a.id = b.plate_id AND a.order_id = b.order_id and a.organ_id = b.organ_id
                  LEFT JOIN order_goods e ON e.id = a.goods_id AND e.order_id = a.order_id and e.organ_id = a.organ_id
@@ -279,4 +279,14 @@
         SELECT count(*) FROM order_plate
         WHERE order_id = #{orderId} AND organ_id = #{organId} AND deleted = #{deleted}
     </select>
+
+    <select id="selectPlateSize" resultType="java.math.BigDecimal">
+
+
+        select sum(area) from order_plate where order_id = #{orderId};
+
+
+    </select>
+
+
 </mapper>