From cc48cf466603cb9c1abac0bcfd45d1b5b1601298 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 21 May 2024 17:46:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ES=E6=96=87=E6=A1=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BC=80=E6=96=99=E9=95=BF-=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/dal/dataobject/ordermodel/OrderModelDO.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java index aa13a7c47..9a2e78df8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java @@ -38,6 +38,13 @@ public class OrderModelDO extends ESDocument { @Schema(description = "小板类型") private String boardType; + + @Schema(description = "开料长") + private BigDecimal splitLength; + @Schema(description = "开料宽") + private BigDecimal splitWidth; + + @Schema(description = "偏移量X") private BigDecimal offsetX; @Schema(description = "偏移量Y") From 5fb2084f28e5f7935842d1a0acf728a0caf39a81 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 22 May 2024 10:02:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=A0=E5=9E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=B0=91BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imes/module/executor/service/plate/PlateServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index eb664cac4..82e04d930 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -207,7 +207,7 @@ public class PlateServiceImpl implements PlateService { .in(OrderItemDO::getBodyId, bodyIds) .select(OrderItemDO::getBodyId) ); - Set plateIds = list.stream().map(BodyPlateIdDTO::getPlateId).collect(Collectors.toSet()); + List plateIds = list.stream().map(BodyPlateIdDTO::getPlateId).collect(Collectors.toList()); List orderModelDOS = buildRespByPlateIds(plateIds, ORDER_PLATE_MODEL); Map> map = orderModelDOS.stream().collect(Collectors.groupingBy(e -> { return list.stream().filter(f -> Objects.equals(f.getPlateId(), e.getPlateId())).map(BodyPlateIdDTO::getBodyId).findAny().orElse(null); @@ -241,6 +241,7 @@ public class PlateServiceImpl implements PlateService { SearchRequest.Builder builder = new SearchRequest.Builder(); builder.index(index); builder.query(q -> q.terms(b -> b.field("plateId").terms(e->e.value(fieldValues)))); + builder.size(plateIds.size()); try { SearchResponse search = elasticsearchClient.search(builder.build(), OrderModelDO.class); List> hits = search.hits().hits(); From 0873a731961aeb26bc5d92fbc4000f86800b0f37 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 22 May 2024 14:11:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E6=BA=90=E6=95=B0=E6=8D=AE-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E9=9A=8F?= =?UTF-8?q?=E6=9C=BAID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/OptimizePlateDetialRespVO.java | 3 +++ .../optimizeplan/OptimizePlanServiceImpl.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java index 06f5036e3..814454eb6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java @@ -8,6 +8,9 @@ import lombok.Data; @Data public class OptimizePlateDetialRespVO { + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + private Long id; + @Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED) private String plateName; 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 92b1d46d5..41bcccc4e 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 @@ -1,6 +1,8 @@ package com.cf.imes.module.executor.service.optimizeplan; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.FieldValue; @@ -90,7 +92,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Resource private ElasticsearchClient elasticsearchClient; - //public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; + private Snowflake snowflake = IdUtil.getSnowflake(); @Resource private MachineApi machineApi; @@ -302,6 +304,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OrderSource orderSource = new OrderSource(); List optimizePlateDetialRespVO = plateMapper.selectPlate(orderId); + // 赋值随机ID + for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) { + plateDetialRespVO.setId(snowflake.nextId()); + } List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) @@ -340,6 +346,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); List optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds); + // 赋值随机ID + for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) { + plateDetialRespVO.setId(snowflake.nextId()); + } List orderDOS = orderMapper.selectBatchIds(orderIds); From f247866769704a6647068b4107ec49828c7314b0 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 22 May 2024 15:23:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E6=BA=90=E6=95=B0=E6=8D=AE-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/vo/OptimizePlateDetialRespVO.java | 8 ++++---- .../optimizeplan/OptimizePlanServiceImpl.java | 8 -------- .../main/resources/mapper/plate/PlateMapper.xml | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 17 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/OptimizePlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java index 814454eb6..29aab6115 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java @@ -8,8 +8,8 @@ import lombok.Data; @Data public class OptimizePlateDetialRespVO { - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) - private Long id; + @Schema(description = "大板ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long boardId; @Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED) private String plateName; @@ -20,8 +20,8 @@ public class OptimizePlateDetialRespVO { @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) private String color; - @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer texture; + @Schema(description = "是否有纹路", requiredMode = Schema.RequiredMode.REQUIRED) + private Boolean hasTexture; @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) private Double thickness; 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 41bcccc4e..e3bbca85b 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 @@ -304,10 +304,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OrderSource orderSource = new OrderSource(); List optimizePlateDetialRespVO = plateMapper.selectPlate(orderId); - // 赋值随机ID - for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) { - plateDetialRespVO.setId(snowflake.nextId()); - } List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) @@ -346,10 +342,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); List optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds); - // 赋值随机ID - for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) { - plateDetialRespVO.setId(snowflake.nextId()); - } List orderDOS = orderMapper.selectBatchIds(orderIds); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index c6d8d023a..61b35ece7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -177,7 +177,8 @@ - + + @@ -192,7 +193,10 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - op.texture as texture, + (case + when p.texture ='' then false + else true end ) as hasTexture, + og.id as boardId, og.goods_name as plateName, og.material as material, og.color as color, @@ -204,7 +208,7 @@ left join plate p on og.goods_id = p.id left join order_remain_plate orp on op.id = orp.plan_id where og.order_id = #{orderId} - group by plateName,material,color,thickness,spec,remainPlateNum,texture; + group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture; @@ -215,7 +219,10 @@ select count(distinct og.id) as boardNum, count(distinct op.id) as plateNum, - op.texture as texture, + (case + when p.texture ='' then false + else true end ) as hasTexture, + og.id as boardId, og.goods_name as plateName, og.material as material, og.color as color, @@ -232,7 +239,7 @@ #{orderIds} - group by plateName,material,color,thickness,spec,remainPlateNum,texture; + group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture; From 7d14c155a845fd13c390876ac8ed113b439a5fa3 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 24 May 2024 15:03:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=92=E5=8D=95=E6=8E=A5=E5=8F=A3=20--?= =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=8E=92=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E5=88=97=E8=A1=A8bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8Capi=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/PlateDetialRespVO.java | 3 ++ .../dal/mysql/orderItem/OrderItemMapper.java | 4 ++ .../executor/dal/mysql/plan/PlanMapper.java | 2 +- .../executor/dal/mysql/plate/PlateMapper.java | 2 +- .../service/order/OrderServiceImpl.java | 9 ++++ .../service/plan/PlanServiceImpl.java | 2 +- .../service/plate/PlateServiceImpl.java | 3 +- .../resources/mapper/order/OrderMapper.xml | 2 +- .../mapper/orderItem/OrderItemMapper.xml | 30 +++++++++++++ .../resources/mapper/plate/PlateMapper.xml | 43 +++++++++++-------- 10 files changed, 78 insertions(+), 22 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/PlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java index baa63b68c..b7ce08c37 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java @@ -169,9 +169,12 @@ public class PlateDetialRespVO { @Schema(description = "加工组名称", requiredMode = Schema.RequiredMode.REQUIRED) private String processGroupName; + + @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") private Integer openDoorType; + @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") private Boolean hasHole; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index 2be3b749a..77ce9df8b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -6,6 +6,7 @@ import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderModuleRe import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPlatesDetailRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailReqVO; +import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailRespVO; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.orderModuleExtra.OrderModuleExtraDO; @@ -31,4 +32,7 @@ public interface OrderItemMapper extends BaseMapperX { List selectPlateList(PlateDetailReqVO reqVO); + + + PlateDetailRespVO selectPlateNumList(@Param("orderId") Long orderId); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index 74d5c02e4..ee250e902 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -71,7 +71,7 @@ public interface PlanMapper extends BaseMapperX { default PlanDO selectByOrderId(Long orderId) { return selectOne(new MPJLambdaWrapperX() - .eqIfPresent(PlanDO::getOrderNos, orderId)); + .like(PlanDO::getOrderNos, orderId)); } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index f3958a95c..e6b050289 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -90,7 +90,7 @@ public interface PlateMapper extends BaseMapperX { Set selectBatchOrderIdsAndGoodsIds(@Param("itemList") List itemList); - PlateDetailRespVO selectPlateNumList(PlateDetailReqVO reqVO); +// PlateDetailRespVO selectPlateNumList(PlateDetailReqVO reqVO); List selectPlateDetialList(@Param("orderId") Long orderId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 7ab70e342..747f2eca7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject; import cn.smallbun.screw.core.util.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants; +import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.executor.controller.admin.order.vo.order.*; @@ -37,11 +39,13 @@ import com.cf.imes.module.executor.util.fileConversion.admin.api.webcad.ApiTypeR import com.cf.imes.module.executor.util.fileConversion.admin.files.excel.ExcelTypeRealize; import com.cf.imes.module.system.api.application.ApplicationApi; import com.cf.imes.module.system.api.user.AdminUserApi; +import com.cf.imes.module.system.enums.ErrorCodeConstants; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; @@ -278,6 +282,7 @@ public class OrderServiceImpl implements OrderService { } @Override + @Transactional(rollbackFor = Exception.class) public Long importApiData(String orderNo) { // 获取token Long organId = SecurityFrameworkUtils.getLoginUser().getOrganId(); @@ -410,11 +415,15 @@ public class OrderServiceImpl implements OrderService { goodsDO = (List) map.get("goodsDO"); List plateGoodDOS = (List) map.get("plateGoodDOLists"); validateCustomOrderNoExists(order.get(0).getCustomOrderNo()); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0),goodsDO,plateGoodDOS); List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); + orderInputProcessor.batchSaveModel(orderModelDOs); + // System.out.println("plateDO = " + plateDO+ " BeanUtils.toBean(plateDetail, OrderModelDO.class) = " + orderModelDOs); + return order.get(0).getId(); } 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 62259d44e..542f386d9 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 @@ -270,7 +270,7 @@ public class PlanServiceImpl implements PlanService { .eqIfPresent("op.is_door", pageReqVO.getIsDoor()) .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()}) - .groupBy("a.id","og.id") + .groupBy("a.id","og.id","og.goods_name","og.color","og.material","op.goods_id") .orderByDesc("a.create_time"); List filterTypes = new ArrayList<>(); if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 82e04d930..2c3794a15 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -112,7 +112,8 @@ public class PlateServiceImpl implements PlateService { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); // 查询生产单下的大板,余料板，排单状态的信息 - PlateDetailRespVO plateDetailRespVO = plateMapper.selectPlateNumList(reqVO); + PlateDetailRespVO plateDetailRespVO = orderItemMapper.selectPlateNumList(reqVO.getOrderId()); +// PlateDetailRespVO plateDetailRespVO = plateMapper.selectPlateNumList(reqVO); plateDetailRespVO.setCompanyId(loginUser.getId()); // PlateRespVO plateRespVO = BeanUtil.toBean(plateDetailRespVO, PlateRespVO.class); 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 5e8f7de33..b9ca9a36f 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 @@ -7,7 +7,7 @@ og.goods_name, og.color, og.material, op.goods_id, count(op.id) as num, sum(op.area) as area from `order` a inner join order_plate op on a.id = op.order_id and op.is_cancel = 0 - inner join order_goods og on op.goods_id = og.goods_id + inner join order_goods og on op.goods_id = og.id left join order_item oi on a.id = oi.order_id left join order_plan_item opi on oi.id = opi.item_id ${ew.customSqlSegment} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 335d88dba..0a86834b1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -99,4 +99,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 61b35ece7..863d8240d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -89,26 +89,35 @@ - + - - - - - +