Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

未排订单-板材分组，板材数据补充片数和面积

Browse Source
This commit is contained in:
gaoqr
2026-04-21 18:28:16 +08:00
parent a8550740d0
commit f1bb8a410d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+1 -1
View File
@@ -632,7 +632,7 @@ public class PlanServiceImpl implements PlanService {
statusList.add(OrderStatusEnum.SORTED.getStatus()); statusList.add(OrderStatusEnum.SORTED.getStatus());
QueryWrapperX<PlanItemDO> queryWrapperX = new QueryWrapperX<>(); QueryWrapperX<PlanItemDO> queryWrapperX = new QueryWrapperX<>();
IPage<OrderGoodsResp> orderGoodsResps = new PageDTO<>(); IPage<OrderGoodsResp> orderGoodsResps;
Integer type = 0; Integer type = 0;
if (CollUtil.isNotEmpty(pageReqVO.getRoomId()) || CollUtil.isNotEmpty(pageReqVO.getBodyId())) { if (CollUtil.isNotEmpty(pageReqVO.getRoomId()) || CollUtil.isNotEmpty(pageReqVO.getBodyId())) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+7 -3
View File
@@ -232,6 +232,8 @@
<result property="texture" column="texture"/> <result property="texture" column="texture"/>
<result property="thickness" column="thickness"/> <result property="thickness" column="thickness"/>
<result property="brand" column="brand"/> <result property="brand" column="brand"/>
<result property="num" column="num"/>
<result property="area" column="area"/>
<collection property="orderIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderIds" resultMap="orderIdsMap"/> <collection property="orderIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderIds" resultMap="orderIdsMap"/>
@@ -272,14 +274,15 @@
<select id="selectNoPlanGoodsList" resultMap="OrderGoodsMap" parameterType="java.lang.Long"> <select id="selectNoPlanGoodsList" resultMap="OrderGoodsMap" parameterType="java.lang.Long">
select distinct select
og.color as color, og.color as color,
og.goods_name as goodsName, og.goods_name as goodsName,
og.material as material, og.material as material,
og.thickness as thickness, og.thickness as thickness,
og.brand as brand, og.brand as brand,
og.texture as texture og.texture as texture,
sum(og.plate_num - og.planned_plate_num) as num,
sum(og.area - og.planned_plate_area) as area
from orders o from orders o
join order_goods og on o.id = og.order_id and og.organ_id = #{organId} join order_goods og on o.id = og.order_id and og.organ_id = #{organId}
@@ -287,6 +290,7 @@
${ew.customSqlSegment} ${ew.customSqlSegment}
and og.plate_num - og.planned_plate_num > 0 and og.plate_num - og.planned_plate_num > 0
and og.deleted = false and og.deleted = false
group by og.color, og.goods_name, og.material, og.thickness, og.brand, og.texture
order by thickness desc order by thickness desc
</select> </select>