From 2112536aeb1fd2bf76fe014c0aa94029c8a538a4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 8 Apr 2024 14:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2-=E5=88=86=E5=A0=86-=E6=89=93=E5=8C=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=812.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/grouping/GroupingController.java | 8 +- .../admin/grouping/vo/OrderPageReqVO.java | 8 +- .../grouping/vo/OrderPlateListRespVO.java | 2 +- .../process/ProductionProcessController.java | 32 ++--- .../admin/process/vo/OrderProStepReqVO.java | 24 ++++ .../admin/process/vo/OrderProcessReqVO.java | 12 +- ...temVO.java => OrderProcessStepItemVO.java} | 4 +- .../admin/process/vo/ProcessPageReqVO.java | 6 +- .../admin/process/vo/ProcessRespVO.java | 2 + .../query/ProductionStatusController.java | 7 +- .../query/vo/pack/OrderPackagePageReqVO.java | 2 +- .../admin/query/vo/pack/OrderPackageVO.java | 2 +- .../query/vo/pack/PackageDetailsRespVO.java | 4 +- .../productionStatus/OrderPlatePageReqVO.java | 2 +- .../query/vo/salary/PriceRatePageReqVO.java | 22 +-- .../dal/dataobject/plate/OrderPlateDO.java | 127 +++++++++++++++++ .../manage/dal/dataobject/plate/PlateDO.java | 2 +- .../dataobject/process/OrderProcessNDO.java | 11 +- .../process/OrderProcessStepItemNDO.java | 5 +- .../process/OrderProcessStepNDO.java | 4 +- .../dal/mysql/pack/OrderPackageMapper.java | 4 +- .../dal/mysql/plate/OrderPlateMapper.java | 23 ++++ .../dal/mysql/process/OrderProcessMapper.java | 4 +- .../mysql/process/ProcessStepItemMapper.java | 12 +- .../dal/mysql/process/ProcessStepMapper.java | 33 ++--- .../process/ProductionProcessMapper.java | 9 ++ .../service/grouping/GroupingServiceImpl.java | 1 + .../process/ProductionProcessService.java | 14 +- .../process/ProductionProcessServiceImpl.java | 104 ++++++++------ .../query/ProductionStatusService.java | 2 +- .../query/ProductionStatusServiceImpl.java | 48 +++---- .../dal/mysql/plate/OrderPlateMapper.xml | 128 ++++++++++++++++++ .../mysql/process/ProcessStepItemMapper.xml | 45 +++++- .../dal/mysql/process/ProcessStepMapper.xml | 76 +++++++---- .../mysql/process/ProductionProcessMapper.xml | 79 +++++++++++ .../dal/mysql/query/OrderItemMapper.xml | 32 ++--- .../dal/mysql/query/OrderPartsMapper.xml | 23 ++-- .../admin/process/ProcessGroupController.java | 5 +- 38 files changed, 681 insertions(+), 247 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java rename cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/{OrderPorcessStepItemVO.java => OrderProcessStepItemVO.java} (87%) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java index e8d6224e2..95d7a8b10 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java @@ -40,7 +40,7 @@ public class GroupingController { @Operation(summary = "查询订单") @PreAuthorize("@ss.hasPermission('manage:grouping:query')") public CommonResult> getGroupingList(@Valid OrderPageReqVO pageReqVO) { - + // PageResult groupingList = groupingService.getGroupingList(pageReqVO); return success(BeanUtils.toBean(groupingList, ProcessRespVO.class)); @@ -56,7 +56,7 @@ public class GroupingController { @Operation(summary = "查看订单的板材信息(未加入包裹的板材信息)") @PreAuthorize("@ss.hasPermission('manage:grouping:query')") public CommonResult> notJoinedGroupingPlateList(@Valid OrderModuleReqVO reqVO) { - + // return success(groupingService.notJoinedGroupingPlateList(reqVO)); } @@ -127,7 +127,7 @@ public class GroupingController { - @GetMapping("/export") +/* @GetMapping("/export") @Operation(summary = "查看订单的板材信息(已将加入包裹的板材信息)") @PreAuthorize("@ss.hasPermission('manage:grouping:export')") public void exportData(@Valid ExportJsonReqVO reqVO) { @@ -136,7 +136,7 @@ public class GroupingController { - } + }*/ diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java index 7a1d95ed6..8019b7532 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java @@ -19,8 +19,6 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @ToString(callSuper = true) public class OrderPageReqVO extends PageParam { - @Schema(description = "工序 id") - private Long id; @Schema(description = "生产单号") private Long orderNo; @@ -34,6 +32,10 @@ public class OrderPageReqVO extends PageParam { @Schema(description = "地址") private String address; + + @Schema(description = "经销商") + private String dealer; + @Schema(description = "开始时间",requiredMode = Schema.RequiredMode.REQUIRED) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDateTime[] startTime; @@ -42,6 +44,6 @@ public class OrderPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDateTime[] endTime; - @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @Schema(description = "订单状态-默认全都显示",requiredMode = Schema.RequiredMode.REQUIRED) private List statusList; } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java index e12bcbbf9..d54cbfeb2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java @@ -4,7 +4,7 @@ package com.cf.imes.module.manage.controller.admin.grouping.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@Schema(description = "管理后台 - 生产单版件表 Response VO") +@Schema(description = "管理后台 - 生产单板件表 Response VO") @Data public class OrderPlateListRespVO { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java index 03ace49e2..0113733d8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java @@ -3,18 +3,14 @@ package com.cf.imes.module.manage.controller.admin.process; import com.cf.imes.framework.common.pojo.CommonResult; 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.process.vo.OrderPorcessStepItemVO; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderProcessReqVO; -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.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlateRespVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.PlatePageVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; import com.cf.imes.module.manage.service.process.ProductionProcessService; import com.cf.imes.module.manage.service.query.ProductionStatusService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -42,7 +38,7 @@ public class ProductionProcessController { @GetMapping("/page") - @Operation(summary = "获得生产工序分页") + @Operation(summary = "查看生产工序分页") @PreAuthorize("@ss.hasPermission('manage:process:query')") public CommonResult> getUserPage(@Valid ProcessPageReqVO pageReqVO) { @@ -54,20 +50,22 @@ public class ProductionProcessController { @GetMapping("/select") - @Operation(summary = "根据工序号获得生产工序下的加工项") + @Operation(summary = "根据工序号查看生产工序下的加工项") @PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> selectProcess(@Valid OrderProcessReqVO reqVO){ - List orderProcessById = productionProcessService.getOrderProcessById(reqVO); + public CommonResult> selectProcess(@Valid OrderProcessReqVO reqVO){ + List orderProcessById = productionProcessService.getOrderProcessById(reqVO); return CommonResult.success(orderProcessById); } + @PutMapping("/update") - @Operation(summary = "根据工序步骤 id 修改生产工序步骤表的状态") + @Operation(summary = "根据工序明细 ID 修改生产工序明细表的状态") + @Parameter(name = "id", description = "工序明细ID", required = true, example = "1") @PreAuthorize("@ss.hasPermission('manage:process:update')") - public CommonResult updateProcessStatus(@Valid Long id){ + public CommonResult updateProcessStatus(@Valid @RequestParam("id") Long id){ productionProcessService.updateProcessStatus(id); return success(true); @@ -76,10 +74,10 @@ public class ProductionProcessController { @PutMapping("/updateAll") - @Operation(summary = "根据工序 id 修改生产单工序表的状态") + @Operation(summary = "修改生产步骤表的工序状态") @PreAuthorize("@ss.hasPermission('manage:process:update')") - public CommonResult updateAllProcessStatus(@Valid Long id){ - productionProcessService.updateAllProcessStatus(id); + public CommonResult updateAllProcessStatus(@Valid @RequestBody OrderProStepReqVO reqVO){ + productionProcessService.updateAllProcessStatus(reqVO); return success(true); } @@ -89,8 +87,9 @@ public class ProductionProcessController { @GetMapping("/selectPlateName") @Operation(summary = "查看板材信息的组合名称") + @Parameter(name = "processStepId", description = "工序步骤ID", required = true, example = "1") @PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> selectPlateName(@Valid Long processStepId){ + public CommonResult> selectPlateName(@Valid @RequestParam("processStepId") Long processStepId){ return success(productionProcessService.selectPlateName(processStepId)); @@ -107,5 +106,4 @@ public class ProductionProcessController { } - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java new file mode 100644 index 000000000..f360e4614 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProStepReqVO.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.manage.controller.admin.process.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "管理后台 - 修改生产步骤表 ") +@Data +@ToString(callSuper = true) +public class OrderProStepReqVO { + + + @Schema(description = "工序步骤id", requiredMode = Schema.RequiredMode.REQUIRED) + private Long processStepId; + + + @Schema(description = "生产单工序ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long orderProcessId; + + + @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) + private Long orderId; +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java index 37a093cb9..f47489d82 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessReqVO.java @@ -5,20 +5,20 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.ToString; -@Schema(description = "管理后台 - 生产单工序表 order_process_{N} Request VO") +@Schema(description = "管理后台 - 生产单工序明细表 Request VO") @Data @ToString(callSuper = true) public class OrderProcessReqVO { - @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "12") - private Long id; + @Schema(description = "工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "12") + private Long processStepId; - @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @Schema(description = "工序状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") private Boolean status; - @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED, example = "1234") - private Long orderNo; + @Schema(description = "生产单工序ID",requiredMode = Schema.RequiredMode.REQUIRED, example = "1234") + private Long orderProcessId; } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPorcessStepItemVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java similarity index 87% rename from cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPorcessStepItemVO.java rename to cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java index 22aa48458..50e4dba77 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderPorcessStepItemVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java @@ -10,10 +10,10 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class OrderPorcessStepItemVO { +public class OrderProcessStepItemVO { - @Schema(description = "主键") + @Schema(description = "主键-工序明细ID") private Long id; @Schema(description = "加工项名称") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java index 67bcf61cd..eeb76a9ae 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 生产单工序表 order_process_{N} 分页 Request VO ") +@Schema(description = "管理后台 - 生产单表 分页 Request VO ") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -17,8 +17,8 @@ public class ProcessPageReqVO extends PageParam { @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "12") private Long id; - @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - private Long status; + @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + private Boolean status; @Schema(description = "生产单号") private Long orderNo; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java index 3b833a9ac..f052388fe 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java @@ -14,6 +14,8 @@ public class ProcessRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") private Long id; + @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") + private Long processStepId; @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private String customOrderNo; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java index 315d3d009..3b24d0474 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/ProductionStatusController.java @@ -150,12 +150,11 @@ public class ProductionStatusController { @GetMapping("/queryPackageDetails") @Operation(summary = "查看包裹详情分页") + @Parameter(name = "packId", description = "包裹Id", required = true) @PreAuthorize("@ss.hasPermission('manage:query:query')") - public CommonResult> queryPackageDetails(@Valid OrderPackagePageReqVO pageReqVO){ + public CommonResult> queryPackageDetails(@Valid @RequestParam("packId") Long packId){ - PageResult packageDetailsRespVOPageResult = productionStatusService.queryPackageDetails(pageReqVO); - - return CommonResult.success(packageDetailsRespVOPageResult); + return CommonResult.success(productionStatusService.queryPackageDetails(packId)); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java index 0ca0d891b..3d92652ec 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackagePageReqVO.java @@ -13,7 +13,7 @@ import lombok.ToString; @ToString(callSuper = true) public class OrderPackagePageReqVO extends PageParam { - @Schema(description = "包裹编号") + @Schema(description = "包裹Id") private Long packageNo; /* @Schema(description = "包裹类型") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java index b2a56e4b7..87a981ff9 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/OrderPackageVO.java @@ -12,7 +12,7 @@ public class OrderPackageVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "主键-包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) private Long id; @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java index 9659ad697..b29f625bd 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java @@ -15,10 +15,10 @@ public class PackageDetailsRespVO { private String cabinetName; @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED) - private String palteNo; + private String plateNo; @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String palteName; + private String plateName; @Schema(description = "材料", requiredMode = Schema.RequiredMode.REQUIRED) private String material; 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/OrderPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java index 9c88b2ea0..ea2218d11 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/productionStatus/OrderPlatePageReqVO.java @@ -18,7 +18,7 @@ public class OrderPlatePageReqVO extends PageParam { - @Schema(description = "生产状态(2：生产中，3：生产完成)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2,3") + @Schema(description = "生产状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2,3") private List statusList; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java index b8b81477f..73350b54f 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRatePageReqVO.java @@ -1,14 +1,17 @@ package com.cf.imes.module.manage.controller.admin.query.vo.salary; -import cn.hutool.core.date.DateTime; import com.cf.imes.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import java.util.Date; + +import static com.cf.imes.framework.common.util.date.DateUtils.*; @Schema(description = "管理后台 - 计件工资查询分页 Request VO") @Data @@ -16,29 +19,26 @@ import java.time.LocalDateTime; @ToString(callSuper = true) public class PriceRatePageReqVO extends PageParam { - @Schema(description = "工序id") - private Long orderProcessId; - - @Schema(description = "生产单工序步骤状态(已加工状态)", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean status; @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime startTime; + private String startTime; + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime endTime; + private String endTime; + @Schema(description = "加工人") private String creator; + @Schema(description = "工序名称") private String name; - @Schema(description = "显示零单价(默认不显示)", requiredMode = Schema.RequiredMode.REQUIRED) + + @Schema(description = "显示零单价(默认不显示-false)", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean noShowZero; - - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java new file mode 100644 index 000000000..7d20e49bc --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java @@ -0,0 +1,127 @@ +package com.cf.imes.module.manage.dal.dataobject.plate; + + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +@TableName("order_plate") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OrderPlateDO extends BaseDO { + + + // 板件 ID + @TableId + private Long id; + + // 生产单号 + private Long orderId; + + // 组织 ID + private Long organId; + + // 板名称 + private String name; + + // 自定义板编号 + private String plateNo; + + // 板类型，0 层板 1 立板 2 背板 + private Integer type; + + // 商品 ID + private String goodsId; + + // 宽度 + private Double width; + + // 高度 + private Double height; + + // 厚度 + private Double thickness; + + // 拆单宽度 + private Double splitWidth; + + // 拆单高度 + private Double splitHeight; + + // 拆单厚度 + private Double splitThickness; + + // 左封边厚度 + private Double sealLeft; + + // 右封边厚度 + private Double sealRight; + + // 上封边厚度 + private Double sealUp; + + // 下封边厚度 + private Double sealDown; + + // 面积 + private Double area; + + // 纹路类型，0 正纹 1 可翻转 2 反纹 + private Integer texture; + + // 孔面类型，0 正面 1 反面 2 侧面 + private Integer holeFace; + + // 排孔类型，0 正纹 1 反面 2 随意面 + private Integer holeArrange; + + // 异型孔数量 + private Integer unregularPointCount; + + // 正面孔数量 + private Integer frontHoleCount; + + // 背面孔数量 + private Integer backHoleCount; + + // 侧面孔数量 + private Integer sideHoleCount; + + // 正面造型量 + private Integer frontModelCount; + + // 背面造型量 + private Integer backModelCount; + + // 是否门板 + private Boolean isDoor; + + // 开门类型，0 无 1 左 2 右 3 上 4 下 + private Integer openDoorType; + + // 异型偏移 x + private Float offsetX; + + // 异型偏移 y + private Float offsetY; + + // 是否孤形对角 + private Boolean isArcAcross; + + // 模块类型 ID + private Long moduleTypeId; + + // 排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠 + private Integer filterType; + + // 备注 + private String remark; + + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java index 48113217e..a1c9a9002 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java @@ -12,7 +12,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; * * @author 晨丰科技 */ -@TableName("plate_n") +@TableName("plate") @KeySequence("plate_n_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessNDO.java index 9cec8a660..c16a8d2e2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessNDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessNDO.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -@TableName(value = "order_process_n") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users +@TableName(value = "order_process") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -20,7 +20,7 @@ public class OrderProcessNDO extends BaseDO { private Long id; // 生产单号 - private Long orderNo; + private Long orderId; // 工序名 private String name; @@ -31,5 +31,12 @@ public class OrderProcessNDO extends BaseDO { // 工序组 id private Long groupId; + // 板材大小 + private Float size; + + // 下一工序Id + private Long nextStepId; + + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java index 999eafa7f..149b1eb66 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepItemNDO.java @@ -8,14 +8,13 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -@TableName(value = "order_process_step_item_n", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users +@TableName(value = "order_process_step_item", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class OrderProcessStepItemNDO extends BaseDO{ +public class OrderProcessStepItemNDO { @TableId diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java index f0c974eb9..31099e75d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; import java.util.Date; -@TableName(value = "order_process_step_n") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users +@TableName(value = "order_process_step") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users @Data @Builder @NoArgsConstructor @@ -24,7 +24,7 @@ public class OrderProcessStepNDO extends BaseDO { private Long id; // 生产单号 - private Long orderNo; + private Long orderId; //组织ID private Long organId; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java index e7c1483bd..e6778aeba 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java @@ -28,9 +28,9 @@ public interface OrderPackageMapper extends BaseMapperX { - default OrderPackageDO selectByPackNo(Long orderNo) { + default OrderPackageDO selectByPackNo(Long packId) { return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderPackageDO::getPackageNo, orderNo)); + .eqIfPresent(OrderPackageDO::getId, packId)); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java new file mode 100644 index 000000000..c73299167 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.java @@ -0,0 +1,23 @@ +package com.cf.imes.module.manage.dal.mysql.plate; + + +import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; +import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlatePageReqVO; +import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrderPlateMapper extends BaseMapperX { + + + + List selectPlateDetail(PatchingPlatePageReqVO pageReqVO); + + + + PlateDetailsRespVO selectPlate(@Param("plateId") Long plateId); +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java index f66cc3020..6f85abc1e 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java @@ -22,7 +22,7 @@ public interface OrderProcessMapper extends BaseMapperX { default OrderProcessNDO queryProcess( Long processId , Long orderNo) { return selectOne(new LambdaQueryWrapperX() .eqIfPresent(OrderProcessNDO::getId, processId) - .eqIfPresent(OrderProcessNDO::getOrderNo,orderNo)); + .eqIfPresent(OrderProcessNDO::getOrderId,orderNo)); } @@ -45,7 +45,7 @@ public interface OrderProcessMapper extends BaseMapperX { } - @Update("UPDATE order_process_n SET status = #{status} WHERE id = #{id}") + @Update("UPDATE order_process SET status = #{status} WHERE id = #{id}") void updateStatusById(@Param("id") Long id, @Param("status") Boolean status); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java index d203ad0a3..df826d5ae 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java @@ -2,8 +2,7 @@ package com.cf.imes.module.manage.dal.mysql.process; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -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.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; import org.apache.ibatis.annotations.Mapper; @@ -20,9 +19,16 @@ import java.util.List; public interface ProcessStepItemMapper extends BaseMapperX { + List selectOrder(ProcessPageReqVO pageReqVO); + List selectPlateName(Long processStepId); - List selectOrder(ProcessPageReqVO pageReqVO); + List selectItemProcess(OrderProcessReqVO reqVO); + + + + void updateStatus(OrderProStepReqVO reqVO); + } 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 a5b35e5f8..3b0e0f3d5 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 @@ -1,12 +1,12 @@ package com.cf.imes.module.manage.dal.mysql.process; -import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +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.query.vo.salary.PriceRatePageReqVO; import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO; -import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,14 +22,6 @@ import java.util.List; @Mapper public interface ProcessStepMapper extends BaseMapperX { - default List getStepItemList(Long orderNo, Boolean status) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrderNo, orderNo) - .eqIfPresent(OrderProcessStepNDO::getStatus, status)); - } - - - default OrderProcessStepNDO selectStatusById(Long id) { return selectOne(new LambdaQueryWrapperX() @@ -38,32 +30,23 @@ public interface ProcessStepMapper extends BaseMapperX { } - @Update("UPDATE order_process_step_n SET status = #{status} WHERE id = #{id}") void updateStatusById(@Param("id") Long id, @Param("status") Boolean status); - - default List selectProducitonList(Long orderNo) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getOrderNo, orderNo)); + .eqIfPresent(OrderProcessStepNDO::getOrderId, orderNo)); } - List selectListByStatus(@Param("collect") List collect); - - - - default List selectListBy(PriceRatePageReqVO pageReqVO) { + default List selectStepList(OrderProStepReqVO reqVO, Boolean status) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getStatus, pageReqVO.getStatus()) - .eqIfPresent(OrderProcessStepNDO::getCreator,pageReqVO.getCreator()) - .eqIfPresent(OrderProcessStepNDO::getName,pageReqVO.getName()) - .betweenIfPresent(OrderProcessStepNDO::getCreateTime,pageReqVO.getStartTime(),pageReqVO.getEndTime())); - + .eqIfPresent(OrderProcessStepNDO::getId,reqVO.getProcessStepId()) + .eqIfPresent(OrderProcessStepNDO::getStatus, status) + .eqIfPresent(OrderProcessStepNDO::getOrderId, reqVO.getOrderId())); } - + List selectSalaryList(PriceRatePageReqVO pageReqVO); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.java index 3a398cdfd..09d9e272c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.java @@ -5,10 +5,15 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPageReqVO; +import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; +import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlatePageReqVO; +import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlateRespVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPageReqVO; import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产单表 order_{N} Mapper * @@ -37,6 +42,7 @@ public interface ProductionProcessMapper extends BaseMapperX { .eqIfPresent(OrderDO::getCustomOrderNo,pageReqVO.getCustomOrderNo()) .likeIfPresent(OrderDO::getCustomer,pageReqVO.getCustomer()) .likeIfPresent(OrderDO::getAddress,pageReqVO.getAddress()) + .likeIfPresent(OrderDO::getDealer,pageReqVO.getDealer()) .and(wrapper -> { for (Long status : pageReqVO.getStatusList()) { wrapper.or().eq(OrderDO::getStatus, status); @@ -47,4 +53,7 @@ public interface ProductionProcessMapper extends BaseMapperX { + List selectPatchingPlate(PatchingPlatePageReqVO pageReqVO); + + } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java index 22ee10fd4..32f535b3b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java @@ -68,6 +68,7 @@ public class GroupingServiceImpl implements GroupingService{ @Override public PageResult notJoinedGroupingPlateList(OrderModuleReqVO reqVO) { + // PageHelper.startPage(reqVO.getPageNo(),reqVO.getPageSize()); List orderPlateListRespVOS = orderItemMapper.selectGroupingPlateList(reqVO.getOrderNo()); PageInfo pageInfo = new PageInfo<>(orderPlateListRespVOS); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java index 590aed76a..f92e21109 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java @@ -2,12 +2,8 @@ package com.cf.imes.module.manage.service.process; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderPorcessStepItemVO; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderProcessReqVO; -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.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; import java.util.List; @@ -20,18 +16,18 @@ public interface ProductionProcessService { // 查询工序订单下的加工项的详情 - List getOrderProcessById(OrderProcessReqVO reqVO); + List getOrderProcessById(OrderProcessReqVO reqVO); - // 修改生产单的工序状态 + // 修改工序明细表的工序状态 void updateProcessStatus(Long id); - // 修改生产单工序的全部状态 - void updateAllProcessStatus(Long id); + // 修改生产步骤表的工序状态 + void updateAllProcessStatus(OrderProStepReqVO reqVO); // 查看板材信息的组合名称 diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java index 33fba58de..a33d73a6e 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java @@ -4,15 +4,9 @@ package com.cf.imes.module.manage.service.process; import com.cf.imes.framework.common.enums.ProcessingStatusEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; 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.PackRespVO; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderPorcessStepItemVO; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderProcessReqVO; -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.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessNDO; +import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import com.cf.imes.module.manage.dal.mysql.process.OrderProcessMapper; import com.cf.imes.module.manage.dal.mysql.process.ProcessStepItemMapper; @@ -27,6 +21,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update; @@ -40,9 +35,6 @@ import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update; @Validated public class ProductionProcessServiceImpl implements ProductionProcessService { - @Resource - private ProductionProcessMapper productionProcessMapper; - @Resource private ProcessStepMapper processStepMapper; @@ -63,55 +55,56 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); List processRespVOS = processStepItemMapper.selectOrder(pageReqVO); + // 判断生产步骤表在传入的状态查询后是否为空 + if(processRespVOS.isEmpty()){ + + return null; + } + PageInfo pageInfo = new PageInfo<>(processRespVOS); + // 转换成 PageResult 分页类型 return PageHelperUtil.convertToPageResult(pageInfo); -/* // 根据工序单id查询工序单信息 - OrderProcessNDO orderProcessNDOS = orderProcessMapper.selectByProcessId(pageReqVO.getId()); - pageReqVO.setOrderNo(orderProcessNDOS.getOrderNo()); - pageReqVO.setStatus(orderProcessNDOS.getStatus()); - - - // 查询生产单单分页信息 - return productionProcessMapper.selectPage(pageReqVO);*/ - } + // 查询工序订单下的加工项的详情 @Override - public List getOrderProcessById(OrderProcessReqVO reqVO) { + public List getOrderProcessById(OrderProcessReqVO reqVO) { - OrderPorcessStepItemVO orderPorcessStepItemVO = new OrderPorcessStepItemVO(); - // 获取工序组 id - Long groupId = orderProcessMapper.queryProcess(reqVO.getId(), reqVO.getOrderNo()).getGroupId(); + List orderProcessStepItemVOS = processStepItemMapper.selectItemProcess(reqVO); - // 获取加工的工序项 - List stepItemList = processStepMapper.getStepItemList(reqVO.getOrderNo(), reqVO.getStatus()); + // 判断生产明细表在传入的状态查询后是否为空 + if(orderProcessStepItemVOS.isEmpty()){ + // 修改生产步骤表的工序状态 + processStepMapper.updateStatusById(reqVO.getProcessStepId(),ProcessingStatusEnum.PROCESSED.getStatus()); + return null; + } - // 将工序组 id 加入 - orderPorcessStepItemVO.setOrderProcessId(groupId); - - // 类型转换并返回 - return BeanUtils.toBean(stepItemList, OrderPorcessStepItemVO.class); + return orderProcessStepItemVOS; } - // 修改工序步骤表的工序状态 + + // 修改工序明细表的工序状态 @Override public void updateProcessStatus(Long id) { + // 根据步骤 id 查询当前生产单工序的状态 - OrderProcessStepNDO orderProcessStepNDO = processStepMapper.selectStatusById(id); + OrderProcessStepItemNDO orderProcessStepItemNDO = processStepItemMapper.selectById(id); + // 未加工状态 - Boolean status = orderProcessStepNDO.getStatus(); + Boolean status = orderProcessStepItemNDO.getStatus(); + // 未加工状态才可进行加工 if (ProcessingStatusEnum.PROCESSED.getStatus().equals(status)) { @@ -119,16 +112,18 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); } + // 更新加工状态 - processStepMapper.updateStatusById(id, ProcessingStatusEnum.PROCESSED.getStatus()); + orderProcessStepItemNDO.setStatus(ProcessingStatusEnum.PROCESSED.getStatus()); + processStepItemMapper.updateById(orderProcessStepItemNDO); // 判断生产单工序表的工序状态是否还有未加工 // 获取当前工序 id 下的所有生产单工序步骤表 - List stepItemList = processStepMapper.getStepItemList(orderProcessStepNDO.getOrderNo(), ProcessingStatusEnum.RAW.getStatus()); +// List stepItemList = processStepMapper.getStepItemList(orderProcessStepNDO.getOrderNo(), ProcessingStatusEnum.RAW.getStatus()); // 集合剩余 1 ，代表当前工序步骤已全部加工，修改生产单工序表的状态为已加工 - if (stepItemList.size() == 1) { +/* if (stepItemList.size() == 1) { orderProcessMapper.updateStatusById(orderProcessStepNDO.getOrderProcessId(), ProcessingStatusEnum.PROCESSED.getStatus()); return; } @@ -138,30 +133,49 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { if (processStepNDO.getStatus().equals(ProcessingStatusEnum.RAW.getStatus())) { return; } - } + }*/ } - // 修改生产单工序的状态 + + // 修改生产步骤表的工序状态 @Override - public void updateAllProcessStatus(Long id) { + public void updateAllProcessStatus(OrderProStepReqVO reqVO) { - // 查看当前生产单的工序状态 - Boolean status = orderProcessMapper.selectStatusById(id).getStatus(); - + OrderProcessStepNDO orderProcessStepNDO = processStepMapper.selectStatusById(reqVO.getProcessStepId()); + // 未加工状态 + Boolean status = orderProcessStepNDO.getStatus(); // 未加工状态才可进行加工 if (ProcessingStatusEnum.PROCESSED.getStatus().equals(status)) { + throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); } - // 更新加工状态 - orderProcessMapper.updateStatusById(id, ProcessingStatusEnum.PROCESSED.getStatus()); + + // 修改生产单工序步骤表的状态为已加工 + orderProcessStepNDO.setStatus(ProcessingStatusEnum.PROCESSED.getStatus()); + processStepMapper.updateById(orderProcessStepNDO); + + + // 修改生产单明细表的生产状态 + processStepItemMapper.updateStatus(reqVO); + + + // 查询当前工序步骤表的工序状态是否还有未加工 + List orderProcessStepNDOS = processStepMapper.selectStepList(reqVO, ProcessingStatusEnum.RAW.getStatus()); + // 如果为空，修改工序表的加工状态为已加工 + if(orderProcessStepNDOS.isEmpty()){ + orderProcessMapper.updateStatusById(orderProcessStepNDO.getOrderProcessId(),ProcessingStatusEnum.PROCESSED.getStatus()); + } + + } + // 查看板材信息的组合名称 @Override public List selectPlateName(Long processStepId) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java index e79b20213..976c6aff0 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java @@ -50,7 +50,7 @@ public interface ProductionStatusService { // 查看包裹详情 - PageResult queryPackageDetails(OrderPackagePageReqVO pageReqVO); + List queryPackageDetails(Long packId); // 打印订单 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 f0b632728..8f9025c50 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 @@ -119,30 +119,20 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { @Override public PageResult getSalaryPage(PriceRatePageReqVO pageReqVO) { - // todo 功能完成，数据库数据不完整，测试部分功能完成 + PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + List priceRateReqVOS = processStepMapper.selectSalaryList(pageReqVO); - List orderProcessStepNDOS = processStepMapper.selectListBy(pageReqVO); - - if (pageReqVO.getNoShowZero()) { - for (OrderProcessStepNDO orderProcessStepNDO : orderProcessStepNDOS) { - if (orderProcessStepNDO.getPieceRate() == 0) { - orderProcessStepNDOS.remove(orderProcessStepNDO); + // 判断是否显示计件工资为0的工序 + if(pageReqVO.getNoShowZero().equals(true)){ + for (PriceRateReqVO priceRateReqVO : priceRateReqVOS) { + if(priceRateReqVO.getPriceRate() == 0){ + priceRateReqVOS.remove(priceRateReqVO); } } + } - - List reqVOS = BeanUtils.toBean(orderProcessStepNDOS, PriceRatePageReqVO.class); - - List collect = reqVOS.stream().map(PriceRatePageReqVO::getOrderProcessId).collect(Collectors.toList()); - - - PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - List priceRateReqVOS = processStepMapper.selectListByStatus(collect); PageInfo pageInfo = new PageInfo<>(priceRateReqVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - - return priceRateReqVOPageResult; - + return PageHelperUtil.convertToPageResult(pageInfo); } @@ -175,30 +165,24 @@ public class ProductionStatusServiceImpl implements ProductionStatusService { // 查看包裹详情 @Override - public PageResult queryPackageDetails(OrderPackagePageReqVO pageReqVO) { + public List queryPackageDetails(Long packId) { - OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackNo(pageReqVO.getPackageNo()); + OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackNo(packId); // 查看配件包裹 - if(orderPackageDO.getType() == 1 && orderPackageDO.getType() == 2){ - - PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + if(orderPackageDO.getType() == 1 || orderPackageDO.getType() == 2){ + // List packageDetailsRespVOS = orderPartsMapper.selectParts(orderPackageDO.getPackageNo()); - PageInfo pageInfo = new PageInfo<>(packageDetailsRespVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - return priceRateReqVOPageResult; + + return packageDetailsRespVOS; } // 查看板材包裹 - PageHelper.startPage(pageReqVO.getPageNo(),pageReqVO.getPageSize()); List packageDetailsRespVOS = orderItemMapper.selectByPackageId(orderPackageDO.getId()); - PageInfo pageInfo = new PageInfo<>(packageDetailsRespVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - return priceRateReqVOPageResult; + return packageDetailsRespVOS; } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml new file mode 100644 index 000000000..6576a3ae4 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml index b6d8bf049..855aa771c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml @@ -18,6 +18,7 @@ + @@ -30,10 +31,11 @@ select distinct ops.order_id as id, + ops.id as processStepId, o.custom_order_no as customOrderNo, o.customer as customer, o.address as address, - o.status as status + ops.status as status from order_process_step ops join `order` o on ops.order_id = o.id @@ -60,4 +62,45 @@ + + + + + + + + + + + + + + + + + + + update order_process_step_item set status = true where process_step_id = #{processStepId} and order_process_id = #{orderProcessId}; + + + + + + + \ No newline at end of file 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 7be9613b4..1ca0a6a44 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 @@ -3,8 +3,18 @@ + + + + UPDATE order_process_step SET status = #{status} WHERE id = #{id} + + + + + + - + @@ -12,39 +22,45 @@ - + select ops.name as name , + ops.piece_rate as piece_rate , + ops.piece_type as piece_type, + ops.creator as creator, + SUM(CASE + WHEN ops.piece_type = 1 THEN ops.piece_rate + ELSE ROUND((op.size / ops.piece_rate), 2) * ops.piece_rate + END) AS total_piece_rate, - SELECT - ops.piece_rate AS piece_rate, - ops.piece_type AS piece_type, - ops.name AS process_name, - ops.creator AS creator, - SUM(CASE - WHEN ops.piece_type = 1 THEN ops.piece_rate - ELSE ROUND((opn.size / p.hour_capacity), 2) * ops.piece_rate - END) AS total_piece_rate, - SUM(CASE - WHEN ops.piece_type = 1 THEN 1 - ELSE 10 / ops.piece_rate - END) AS total_piece_num - FROM - order_process_step_n ops - JOIN - order_process_n opn ON ops.order_process_id = opn.id - JOIN - imes_base.process p ON opn.id = p.id - WHERE - ops.order_process_id IN - - #{id} - - GROUP BY - ops.name, ops.creator, ops.piece_type, ops.piece_rate; + SUM(CASE + WHEN ops.piece_type = 1 THEN 1 + ELSE ROUND((op.size / ops.piece_rate), 2) + END) AS total_piece_num + + from order_process_step ops + join order_process op on ops.order_process_id = op.id + + + + and ops.creator = #{creator} + + + and ops.name = #{name} + + + and ops.update_time between #{startTime} and #{endTime} + + + and ops.status = true +/**/ + group by name,piece_rate,piece_type,creator; + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml new file mode 100644 index 000000000..24dad117b --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml index 48151a520..4777d2cdf 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml @@ -6,8 +6,8 @@ - - + + @@ -205,30 +205,20 @@ - - - - - UPDATE order_item oi - SET oi.package_id = (SELECT opn.id - FROM order_package_n opn - WHERE opn.name LIKE CONCAT('%', (SELECT ob.room_name - FROM order_body ob - WHERE oi.body_id = ob.id - AND plate_id = #{plateId}),'%' ) - ) - WHERE plate_id = #{plateId}; + UPDATE order_item oi + SET oi.package_id = (SELECT opn.id + FROM order_package_n opn + WHERE opn.name LIKE CONCAT('%', (SELECT ob.room_name + FROM order_body ob + WHERE oi.body_id = ob.id + AND plate_id = #{plateId}), '%')) + WHERE plate_id = #{plateId}; - + diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml index b1349cfad..c0acb09b6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderPartsMapper.xml @@ -7,7 +7,7 @@ - + @@ -18,14 +18,19 @@ parameterType="java.lang.Long" resultMap="partsMap"> - SELECT name, COUNT(name) AS name_count,model,spec,unit,brand,factory,remark - FROM order_parts - WHERE id IN ( - SELECT parts_id - FROM order_item - WHERE package_id = #{packageNo} - ) - GROUP BY name,model,spec,unit,brand,factory,remark; + + select op.name as name, + op.model as model, + op.spec as spec, + op.unit as unit, + op.brand as brand, + op.material as material, + op.factory as factory, + oi.num as num + from order_package_n opn + join order_item oi on opn.id = oi.package_id + join order_parts op on oi.parts_id = op.id + where opn.id = #{packageNo} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessGroupController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessGroupController.java index 255babb73..f4483fcef 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessGroupController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessGroupController.java @@ -72,9 +72,8 @@ public class ProcessGroupController { @Operation(summary = "更新工序组") @PreAuthorize("@ss.hasPermission('system:process-group:update')") public CommonResult updateProcessGroup(@Valid @RequestBody ProcessListSaveReqVO updateReqVO) { - /*processGroupService.updateProcessGroup(updateReqVO); - return success(true);*/ - return null; + processGroupService.updateProcessGroup(updateReqVO); + return success(true); } @DeleteMapping("/delete")