From 890c32371ba3a31d75b530bbbae82f47921ec012 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 2 Sep 2024 18:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/OrderGoodsResp.java | 6 ++++-- .../optimizeplan/OptimizePlanServiceImpl.java | 4 ++-- .../executor/service/plan/PlanServiceImpl.java | 13 ++++++++----- .../src/main/resources/mapper/order/OrderMapper.xml | 8 +++++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java index a36c5a12d..50c3e3c8e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderGoodsResp.java @@ -16,7 +16,7 @@ public class OrderGoodsResp { @Schema(description = "生产单id") private List orderIds; - @Schema(description = "商品id") + @Schema(description = "商品id-商品编号") private Long goodsId; @Schema(description = "商品名称") private String goodsName; @@ -30,10 +30,12 @@ public class OrderGoodsResp { private BigDecimal height; @Schema(description = "厚") private BigDecimal thickness; - @Schema(description = "商品纹路") + @Schema(description = "商品纹理") private Boolean texture; @Schema(description = "商品品牌") private String brand; + @Schema(description = "商品规格") + private String spec; @Schema(description = "面积") private BigDecimal area; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index a889be687..97957e57e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -213,11 +213,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { orderMapper.updateOrderListStatus(orderIds,OrderStatusEnum.IN_PRODUCTION.getStatus(),getUserOrganId()); - CutedBoardInfo cutedBoardInfo = optimizeBoardModelDO.getCutedBoardInfo(); + CutedBoardInfo cutedBoardInfo = optimizeBoardModelDO.getCutedBoardInfo() == null ? new CutedBoardInfo() : optimizeBoardModelDO.getCutedBoardInfo(); // 获取原排单的开料大板数 + 新增的开料大板数 - long cutedBoardNumber = cutedBoardInfo.getCutedBoardNumber() ; + long cutedBoardNumber = cutedBoardInfo.getCutedBoardNumber() == null ? 0 : cutedBoardInfo.getCutedBoardNumber(); cutedBoardNumber += goodsNo.size(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 9512ab07a..b7ca9b596 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -215,7 +215,7 @@ public class PlanServiceImpl implements PlanService { PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class); // 校验新增的板材是否和排单为统一类型的 - if(!updateReqVO.getItemList().isEmpty()){ + if(!(updateReqVO.getItemList() == null)){ // todo 目前之解决非混单的情况，混单的情况待解决 Long goodsId = updateReqVO.getItemList().stream().map(PlanSaveReqVO.Item::getGoodsId).distinct().toList().get(0); @@ -542,6 +542,8 @@ public class PlanServiceImpl implements PlanService { // 根据排单ID查询ES中的优化数据 todo 目前只解决无混单的情况，混单情况待解决 List optimizeBoardModelDOS = buildBoardByPlanIds(planIds, ORDER_REMAIN_PLATE_MODEL, infoVOList.size()); + for (OptimizeBoardModelDO optimizeBoardModelDO : optimizeBoardModelDOS) { + } // 获取排单对应的生产单的信息 List planOrderRespVOS = planItemMapper.selectOrderList(planIds, getUserOrganId()); @@ -583,7 +585,10 @@ public class PlanServiceImpl implements PlanService { .mapToLong(m-> m.getPlaceBlockNumber() == null ? 0 : m.getPlaceBlockNumber()) .sum()); // 未优化小板数量 - e.setUnOptimizePlateCount(e.getPlateNum() - e.getOptimizePlateCount()); + e.setUnOptimizePlateCount(e.getPlateNum() - optimizeBoardModelDOS.stream() + .filter(f->Objects.equals(f.getPlanId(), e.getId())) + .mapToLong(m-> m.getPlaceBlockNumber() == null ? 0 : m.getPlaceBlockNumber()) + .sum()); // 生产单信息 e.setOrderList(planOrderRespVOS.stream() .filter( f-> Objects.equals(f.getPlanId(), e.getId())) @@ -801,7 +806,7 @@ public class PlanServiceImpl implements PlanService { .eq("og.deleted",false) .inIfPresent("og.order_id", pageReqVO.getOrderIds()) -// .inIfPresent("og.id", goodsIds) + .inIfPresent("og.id", pageReqVO.getIds()) // .isNull("opi.item_id") // .isNotNull("og.id") @@ -841,8 +846,6 @@ public class PlanServiceImpl implements PlanService { List records = orderGoodsResps.getRecords(); - System.out.println("哈哈哈哈哈哈1 "+records.size()); - List goodsIdList = records.stream().map(OrderGoodsResp::getGoodsId).toList(); queryWrapperX.in("og.goods_id", goodsIdList); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index e420c6714..0cb097f2e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -269,6 +269,7 @@ + @@ -289,8 +290,8 @@ select distinct - og.order_id as orderId, - og.id as id, +-- og.order_id as orderId, +-- og.id as id, og.goods_id as goodsId, og.goods_name, @@ -300,7 +301,8 @@ og.thickness, og.width, og.height, - og.brand + og.brand, + og.spec from orders o left join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id