From 2e48b02237a9b7a687d8aac1b0663a6dbe64dbd1 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 30 Apr 2024 15:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7=E5=8D=95?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=BB=84=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionStatus/ProductionGroupVO.java | 13 +++--- .../dal/mysql/process/ProcessStepMapper.java | 19 ++++----- .../query/ProductionStatusServiceImpl.java | 19 +++------ .../dal/mysql/process/ProcessStepMapper.xml | 41 ++++++++++++++++++- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java index 432e725f8..323cd7ea0 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/ProductionGroupVO.java @@ -3,17 +3,18 @@ package com.cf.imes.module.manage.controller.admin.query.vo.productionStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + @Schema(description = "管理后台 - 生产单工序步骤表 order_process_step_{N} Response VO") @Data public class ProductionGroupVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4399") - private Long id; - @Schema(description = "工序组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "嘿嘿") private String groupName; @@ -26,9 +27,11 @@ public class ProductionGroupVO { @Schema(description = "工序负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "cfy_cf") private String manager; - @Schema(description = "加工时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime processDate; + @Schema(description = "排单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "cfy_cf") + private String planNo; + @Schema(description = "加工时间", requiredMode = Schema.RequiredMode.REQUIRED) + private String processDate; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java index fbc28d221..35a294cf6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java @@ -7,6 +7,7 @@ import com.cf.imes.module.manage.controller.admin.process.vo.OrderProStepReqVO; import com.cf.imes.module.manage.controller.admin.process.vo.OrderProcessStepItemVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPageReqVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; +import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.ProductionGroupVO; import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; @@ -39,20 +40,16 @@ public interface ProcessStepMapper extends BaseMapperX { void updateStatusById(@Param("id") Long id, @Param("status") Boolean status); - default List selectProducitonList(Long orderNo) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrderId, orderNo)); - - } +// default List selectProducitonList(Long orderNo) { +// return selectList(new LambdaQueryWrapperX() +// .eqIfPresent(OrderProcessStepNDO::getOrderId, orderNo)); +// +// } + List selectProducitonList(@Param("orderNo") Long orderNo); + - default List selectStepList(OrderProStepReqVO reqVO, Boolean status) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getId,reqVO.getProcessStepId()) - .eqIfPresent(OrderProcessStepNDO::getStatus, status) - .eqIfPresent(OrderProcessStepNDO::getOrderId, reqVO.getOrderId())); - } List selectSalaryList(PriceRatePageReqVO pageReqVO); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java index 04e5a364b..d13200fc4 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java @@ -1,12 +1,10 @@ package com.cf.imes.module.manage.service.query; -import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.manage.controller.admin.pack.vo.OrderPartsReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackagePageReqVO; import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; import com.cf.imes.module.manage.controller.admin.query.vo.pack.PrintOrderRespVO; @@ -14,7 +12,6 @@ import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.*; import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRatePageReqVO; import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO; import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper; import com.cf.imes.module.manage.dal.mysql.process.ProcessStepItemMapper; @@ -28,7 +25,9 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; + + +import static com.sun.xml.bind.WhiteSpaceProcessor.replace; @Service @Validated @@ -70,16 +69,10 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { @Override public List selectProduction(Long orderNo) { - List orderProcessStepNDOS = processStepMapper.selectProducitonList(orderNo); + List productionGroupVOS = processStepMapper.selectProducitonList(orderNo); - List productionGroupVOS = BeanUtils.toBean(orderProcessStepNDOS, ProductionGroupVO.class); - - Long id = orderProcessStepNDOS.get(0).getId(); - - String name = processStepItemMapper.selectById(id).getGroupName(); - - for (int i = 0; i < 1; i++) { - productionGroupVOS.get(i).setGroupName(name); + for (int i = 1; i < productionGroupVOS.size(); i++) { + productionGroupVOS.get(i).setGroupName(null); } return productionGroupVOS; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml index 3280f081b..e1369e016 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml @@ -110,9 +110,48 @@ group by name,piece_rate,piece_type,creator; + + + + + + + + + + + + + + + - \ No newline at end of file