From 58616b1de0cc222ee5654a2bf19654f1386c191c Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 10 Apr 2025 17:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=85=8D=E4=BB=B6=E6=95=B0=E9=87=8FSQL?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/enums/ErrorCodeConstants.java | 2 + .../manage/pack/vo/OrderPartsRespVO.java | 21 +++++- .../query/vo/pack/PackageDetailsRespVO.java | 27 +++++-- .../admin/order/vo/order/LabelOrderData.java | 9 ++- .../order/vo/order/LabelOrderPartsData.java | 25 ++++++- .../order/vo/order/LabelOrderPlateData.java | 18 ++++- .../service/manage/pack/PackServiceImpl.java | 14 +++- .../query/ProductionStatusServiceImpl.java | 11 +++ .../optimizeplan/OptimizePlanServiceImpl.java | 6 +- .../service/order/OrderServiceImpl.java | 74 ++++++++++++++----- .../resources/mapper/order/OrderMapper.xml | 4 +- .../mapper/orderParts/OrderPartsMapper.xml | 56 +++++++++++--- .../mapper/planitem/PlanItemMapper.xml | 6 ++ .../resources/mapper/plate/PlateMapper.xml | 9 +++ .../system/enums/ErrorCodeConstants.java | 5 ++ .../service/machine/MachineServiceImpl.java | 9 +-- 16 files changed, 244 insertions(+), 52 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java index 0faf33a0d..41603dc42 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java +++ b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java @@ -29,6 +29,8 @@ public class ErrorCodeConstants { public static final ErrorCode PLATE_IS_PLAN = new ErrorCode(1_001_109_002, "删除对象中有已排单板件，请将该对象从排单中移除后再选择删除！"); public static final ErrorCode ORDER_ERROR = new ErrorCode(1_001_109_003, "当前生产单柜体，房间已全部删除！"); public static final ErrorCode ORDER_DATA_ERROR = new ErrorCode(1_001_109_004, "生产单/排单的数据已无法使用，请删除重新"); + public static final ErrorCode ORDER_PLAN_ID_NOT_NULL = new ErrorCode(1_001_109_005, "生产单或排单ID至少传入一个"); + public static final ErrorCode ORDER_PLAN_ID_IS_ONE = new ErrorCode(1_001_109_006, "生产单id与排单id与大板分类ID只能传一个"); // ========== 生产单 TODO 补充编号 ========== public static final ErrorCode MODULE_NOT_EXISTS = new ErrorCode(1_001_110_000, "模块不存在"); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsRespVO.java index ae41da5e2..c121bd0d2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/OrderPartsRespVO.java @@ -4,6 +4,9 @@ package com.cf.imes.module.executor.controller.admin.manage.pack.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + @Schema(description = "管理后台 - 配件列表详情 Response VO") @Data public class OrderPartsRespVO { @@ -22,7 +25,7 @@ public class OrderPartsRespVO { private String spec; @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long num; + private BigDecimal num; @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) private String unit; @@ -65,5 +68,21 @@ public class OrderPartsRespVO { private String subparts; + @Schema(description = "数量-用于计算，不显示") + private List count; + + + @Schema(description = "房间-用于计算-不显示") + private List roomId; + + + @Schema(description = "柜体-用于计算-不显示") + private List bodyId; + + + @Schema(description = "加工组-用于计算-不显示") + private List groupId; + + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java index c80507996..10188c599 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java @@ -5,6 +5,7 @@ import com.cf.imes.module.executor.controller.admin.manage.pack.vo.GroupNameList import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Schema(description = "管理后台 - 包裹详情 Response VO") @@ -21,13 +22,15 @@ public class PackageDetailsRespVO { @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED) private String cabinetName; - @Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED) private Long plateId; @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) private String plateNo; + @Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED) + private String customPlateNo; + @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) private String plateName; @@ -64,16 +67,15 @@ public class PackageDetailsRespVO { @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED) private String processGroup; - @Schema(description = "备注(板材和配件都要传递)", requiredMode = Schema.RequiredMode.REQUIRED) private String remark; - @Schema(description = "加工组名称集合") private List processGroupNameList; + @Schema(description = "配件名称-配件类型显示", requiredMode = Schema.RequiredMode.REQUIRED) private String name; @@ -90,7 +92,7 @@ public class PackageDetailsRespVO { private String type; @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED) - private Long num; + private BigDecimal num; @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) private String unit; @@ -104,7 +106,6 @@ public class PackageDetailsRespVO { @Schema(description = "厂家", requiredMode = Schema.RequiredMode.REQUIRED) private String factory; - @Schema(description = "配件颜色", requiredMode = Schema.RequiredMode.REQUIRED) private String partsColor; @@ -124,4 +125,20 @@ public class PackageDetailsRespVO { private String subparts; + + @Schema(description = "数量-用于计算-不显示") + private List count; + + + @Schema(description = "房间-用于计算-不显示") + private List roomId; + + + @Schema(description = "柜体-用于计算-不显示") + private List bodyId; + + + @Schema(description = "加工组-用于计算-不显示") + private List groupId; + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderData.java index 58aa90dc8..570cbee36 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderData.java @@ -19,6 +19,10 @@ public class LabelOrderData { private String customOrderNo; + @Schema(description = "订单状态") + private Integer status; + + @Schema(description = "客户") private String customer; @@ -47,7 +51,7 @@ public class LabelOrderData { private String splitter; - @Schema(description = "生产单日期") + @Schema(description = "订单日期") private LocalDateTime orderDate; @@ -55,5 +59,8 @@ public class LabelOrderData { private LocalDateTime deliveryDate; + @Schema(description = "备注") + private String remark; + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java index e1cc3e274..b688ea056 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPartsData.java @@ -4,6 +4,9 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + @Schema(description = "标签对应的五金包裹数据源信息") @Data public class LabelOrderPartsData { @@ -38,12 +41,32 @@ public class LabelOrderPartsData { @Schema(description = "数量") - private String count; + private BigDecimal count; @Schema(description = "配件单位") private String partsUnit; + @Schema(description = "配件类型") + private String partsType; + + + @Schema(description = "数量-用于计算-不显示") + private List num; + + + @Schema(description = "房间-用于计算-不显示") + private List roomId; + + + @Schema(description = "柜体-用于计算-不显示") + private List bodyId; + + + @Schema(description = "加工组-用于计算-不显示") + private List groupId; + + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java index 3de3a74e6..3a5e91053 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/LabelOrderPlateData.java @@ -44,7 +44,11 @@ public class LabelOrderPlateData { private String customPlateNo; - @Schema(description = "板名称") + @Schema(description = "板材名称-大板名称") + private String goodsPlateName; + + + @Schema(description = "板件名称-小板名称") private String plateName; @@ -56,6 +60,18 @@ public class LabelOrderPlateData { private String plateMaterial; + @Schema(description = "大板长") + private Double goodsPlateLength; + + + @Schema(description = "大板宽") + private Double goodsPlateWidth; + + + @Schema(description = "大板厚") + private Double goodsPlateThickness; + + @Schema(description = "板长") private Double plateLength; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java index 3bb03897b..2c1d2d0fd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -264,7 +265,18 @@ public class PackServiceImpl implements PackService { @Override public List getPartsList(OrderPartsReqVO reqVO) { - return orderPartsMapper.selectPartsList(reqVO.getOrderId(), getUserOrganId()); + List orderPartsRespVOS = orderPartsMapper.selectPartsList(reqVO.getOrderId(), getUserOrganId()); + + orderPartsRespVOS.forEach(f->{ + f.setNum(f.getCount().stream().reduce(BigDecimal.ZERO, BigDecimal::add)); + + f.setCount(null); + f.setBodyId(null); + f.setRoomId(null); + f.setGroupId(null); + }); + + return orderPartsRespVOS; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/query/ProductionStatusServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/query/ProductionStatusServiceImpl.java index edab099d7..dee04f629 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/query/ProductionStatusServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/query/ProductionStatusServiceImpl.java @@ -15,6 +15,8 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.math.BigDecimal; + import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; @@ -43,6 +45,15 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { return new PageResult<>(); } + packageDetailsRespVOS.getRecords().forEach(f->{ + f.setNum(f.getCount().stream().reduce(BigDecimal.ZERO, BigDecimal::add)); + + f.setCount(null); + f.setBodyId(null); + f.setRoomId(null); + f.setGroupId(null); + }); + return new PageResult<>(packageDetailsRespVOS.getRecords(), packageDetailsRespVOS.getTotal()); } 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 cdf053456..910d6bc77 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 @@ -79,8 +79,7 @@ import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConsta import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.util.json.JsonUtils.*; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; -import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_NOT_EXISTS; -import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLAN_NOT_EXISTS; +import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** @@ -473,7 +472,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public OrderSource getOrderSource(Long orderId, Long planId, Long machineId) { if (!Objects.isNull(orderId) && !Objects.isNull(planId)) { - throw exception(154112, "生产单id与排单id与大板分类ID只能传一个"); + throw exception(ORDER_PLAN_ID_IS_ONE); } OrderSource orderSource; if (ObjectUtil.isNotNull(orderId)) { @@ -540,6 +539,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { // 查询生产单对应的包裹信息 List printOrderPackReqVOS = plateMapper.selectOrderPackList(orderId,getUserOrganId()); + if(CollUtil.isNotEmpty(printOrderPackReqVOS)) { // 统计每个订单的包装数量 printOrderPackReqVOS 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 b20c3fea7..ce372afc9 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 @@ -99,6 +99,7 @@ import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.e import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import static com.cf.imes.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.ORDER_PLAN_DATA_ERROR; /** * 生产单表 order_{N} Service 实现类 @@ -161,6 +162,14 @@ public class OrderServiceImpl implements OrderService { private CustomPlateNoGenerateService customPlateNoGenerateService; + @Resource + private PlanItemMapper planItemMapper; + + + @Resource + private EsUtils esUtils; + + private static final String SUBMIT_STATE = "1"; // 空订单 原生产系统 public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; @@ -1432,24 +1441,28 @@ public class OrderServiceImpl implements OrderService { } - @Resource - private PlanItemMapper planItemMapper; - - - @Resource - private EsUtils esUtils; @Override public OrderAllData getOrderAllData(Long orderId, Long planId) { + if (Objects.isNull(orderId) && Objects.isNull(planId)) { + throw exception(ORDER_PLAN_ID_NOT_NULL); + } + + if (!Objects.isNull(orderId) && !Objects.isNull(planId)) { + throw exception(ORDER_PLAN_ID_IS_ONE); + } + Long organId = getUserOrganId(); List orderIds = new ArrayList<>(); OrderAllData orderAllData = new OrderAllData(); + List orderModelDOS; + List labelOrderPlateData; if(planId != null){ @@ -1466,53 +1479,76 @@ public class OrderServiceImpl implements OrderService { // 板材信息 labelOrderPlateData = planItemMapper.selectLabelOrderPlateDataByPlanId(planId,organId); + List plateIdList = labelOrderPlateData.stream().map(LabelOrderPlateData::getPlateId).distinct().toList(); + + // 小板造型信息 + orderModelDOS = esUtils.getEsDocument("orderId","plateId", orderIds,plateIdList, plateIdList.size(), OptimizePlanService.ORDER_PLATE_MODEL, OrderModelDO.class); + }else { + OrderDO orderDO = orderMapper.selectById(orderId); + AssertUtils.notEmpty(orderDO,ORDER_NOT_EXISTS); + orderIds.add(orderId); // 板材信息 labelOrderPlateData = plateMapper.selectLabelOrderPlateDataByOrderId(orderId,organId); + Integer plateIdSize = labelOrderPlateData.stream().map(LabelOrderPlateData::getPlateId).distinct().toList().size(); + + orderModelDOS = esUtils.getEsDocument("orderId", orderIds, plateIdSize, OptimizePlanService.ORDER_PLATE_MODEL, OrderModelDO.class); } + AssertUtils.notEmpty(orderIds,ORDER_PLAN_DATA_ERROR); + + // 生产单信息 List labelOrderData = orderMapper.selectLabelOrderData(orderIds, organId); List packIds = labelOrderPlateData.stream().map(LabelOrderPlateData::getPackageNo).distinct().toList(); - List plateIdList = labelOrderPlateData.stream().map(LabelOrderPlateData::getPlateId).distinct().toList(); - - - // 小板造型信息 - List orderModelDOS = esUtils.getEsDocument("orderId","plateId", orderIds,plateIdList, plateIdList.size(), OptimizePlanService.ORDER_PLATE_MODEL, OrderModelDO.class); // 配件信息 List labelOrderPartsData = orderPartsMapper.selectLabelOrderPartsData(orderIds, organId); - // 包裹信息 - List labelOrderPackData = orderPackageMapper.selectLabelOrderPackData(packIds, organId); + labelOrderPartsData.forEach(f->{ + f.setCount(f.getNum().stream().reduce(BigDecimal.ZERO, BigDecimal::add)); - labelOrderPackData.forEach(f-> f.setPackNum(f.getPackageId().size())); + f.setNum(null); + f.setBodyId(null); + f.setRoomId(null); + f.setGroupId(null); + }); - List packageDOS = orderPackageMapper.selectBatchIds(packIds); + + if(CollUtil.isNotEmpty(packIds)) { + // 包裹信息 + List labelOrderPackData = orderPackageMapper.selectLabelOrderPackData(packIds, organId); + + labelOrderPackData.forEach(f -> f.setPackNum(f.getPackageId().size())); + + List packageDOS = orderPackageMapper.selectBatchIds(packIds); + + labelOrderPlateData.forEach(f->f.setPackageSerialNo(packageDOS.stream().filter(o->o.getId().equals(f.getPackageNo())).findFirst().orElse(new OrderPackageDO()).getPackageNo())); + + orderAllData.setPackDataList(labelOrderPackData); + + } labelOrderPlateData.forEach(f->{ f.setOrderDate(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getOrderDate()); f.setDeliveryDate(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getDeliveryDate()); - f.setPackageSerialNo(packageDOS.stream().filter(o->o.getId().equals(f.getPackageNo())).findFirst().orElse(new OrderPackageDO()).getPackageNo()); + f.setCustomOrderNo(labelOrderData.stream().filter(o->o.getOrderNo().equals(f.getOrderId())).findFirst().orElse(new LabelOrderData()).getCustomOrderNo()); }); - orderAllData.setOrderList(labelOrderData); - orderAllData.setPackDataList(labelOrderPackData); orderAllData.setPlateDataList(labelOrderPlateData); orderAllData.setPartsDataList(labelOrderPartsData); orderAllData.setPlateModels(orderModelDOS); - return orderAllData; } 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 e4217ad26..cb49f9d9e 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 @@ -612,6 +612,7 @@ select distinct id as orderNo, custom_order_no as customOrderNo, + status as status, dealer as dealer, dealer_phone_number as dealerPhoneNumber, customer as customer, @@ -620,7 +621,8 @@ salesman as salesman, splitter as splitter, order_date as orderDate, - delivery_date as deliveryDate + delivery_date as deliveryDate, + remark as remark from orders diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml index 54cd3ed34..6c2c54f24 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml @@ -273,7 +273,6 @@ - @@ -284,6 +283,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index f01509865..1ac5e05f6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -469,12 +469,18 @@ ogs.material as plateMaterial, op.id as plateId, op.order_id as orderId, + ogs.goods_name as goodsPlateName, op.name as plateName, op.plate_no as plateNo, op.custom_plate_no as customPlateNo, + op.width as plateWidth, op.height as plateLength, op.thickness as plateThickness, + ogs.width as goodsPlateWidth, + ogs.height as goodsPlateLength, + ogs.thickness as goodsPlateThickness, + op.split_width as splitWidth, op.split_height as splitHeight, op.split_thickness as splitThickness, 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 6a250477b..ed6c4549f 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 @@ -897,6 +897,7 @@ ob.name as bodyName, op.id as plateId, op.plate_no as plateNo, + op.custom_plate_no as customPlateNo, op.name as plateName, ogs.material as plateMaterial, ogs.color as plateColor, @@ -941,6 +942,7 @@ ob.room_name as roomName, ob.name as bodyName, op.plate_no as plateNo, + op.custom_plate_no as customPlateNo, op.id as plateId, op.name as plateName, ogs.material as plateMaterial, @@ -984,12 +986,18 @@ ogs.material as plateMaterial, op.id as plateId, op.order_id as orderId, + ogs.goods_name as goodsPlateName, op.name as plateName, op.plate_no as plateNo, op.custom_plate_no as customPlateNo, + op.width as plateWidth, op.height as plateLength, op.thickness as plateThickness, + ogs.width as goodsPlateWidth, + ogs.height as goodsPlateLength, + ogs.thickness as goodsPlateThickness, + op.split_width as splitWidth, op.split_height as splitHeight, op.split_thickness as splitThickness, @@ -1017,6 +1025,7 @@ + diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 4d697cac1..4da378b3c 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -343,6 +343,7 @@ public class ErrorCodeConstants { public static final ErrorCode PART_PACK_DATA_ERROR = new ErrorCode(1_002_041_051, "当前包裹数据为空，无法进行操作，请删除包裹"); public static final ErrorCode PLAN_IS_OPERATOR = new ErrorCode(1_002_041_052, "当前排单正在被用户：{} 操作，无法继续操作"); public static final ErrorCode PLAN_IS_OPERATOR_NOT = new ErrorCode(1_002_041_053, "排单：{} ，正在被用户：{} 操作，无法继续操作"); + public static final ErrorCode ORDER_PLAN_DATA_ERROR = new ErrorCode(1_002_041_054, "生产单/排单数据有误，请查看对应的数据"); @@ -415,6 +416,10 @@ public class ErrorCodeConstants { public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_043_001, "当前组织无资金管理"); public static final ErrorCode INVOICE_NO_EXIST = new ErrorCode(1_002_043_002, "当前发票记录有误，请重新查看"); public static final ErrorCode INVOICING_REJECT_REASON = new ErrorCode(1_002_043_003, "请填写拒绝开票原因"); + public static final ErrorCode INVOICE_FILE_IS_NULL = new ErrorCode(1_002_043_004, "发票附件不存在，请重新上传"); + public static final ErrorCode INVOICE_FILE_UPLOAD_FAILED = new ErrorCode(1_002_043_005, "发票附件上传失败，请重新上传"); + public static final ErrorCode INVOICE_FILE_IS_NULL_NOT_DOWNLOAD = new ErrorCode(1_002_043_006, "发票附件不存在，无法下载"); + public static final ErrorCode INVOICE_FILE_DATA_ERROR = new ErrorCode(1_002_043_007, "发票附件下载失败，请重新下载或稍等重试"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 0ad3f7e81..7d22b7b71 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -413,15 +413,8 @@ public class MachineServiceImpl implements MachineService { // 对机台的配置进行解压 machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting())); - Long brandId = machineDO.getBrandId(); + return MachineConvert.convert(machineDO); - MachineBrandDO machineBrandDO = machineBrandMapper.selectById(brandId); - - CuttingRespVO respVO = MachineConvert.convert(machineDO); - - respVO.setBrand(machineBrandDO.getBrand()); - - return respVO; }