diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java index 5f61ea4cf..1f4260aaa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.dal.dataobject.ordermodel; import com.alibaba.fastjson.JSONObject; +import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.es.core.dal.ESDocument; import com.cf.imes.module.executor.util.deviseData.dataTwo.HoleDetail; import com.cf.imes.module.executor.util.deviseData.dataTwo.ModelDetail; 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 deleted file mode 100644 index b4aa62700..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping; - - -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.grouping.vo.*; -import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -import com.cf.imes.module.manage.service.grouping.GroupingService; -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; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 分堆 ") -@RestController -@RequestMapping("/manage/grouping") -@Validated -public class GroupingController { - - - - @Resource - private GroupingService groupingService; - - - - - - @GetMapping("/select") - @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)); - - } - - - - - - - @GetMapping("/notJoinedPlate") - @Operation(summary = "查看订单的板材信息(未加入包裹的板材信息)") - @PreAuthorize("@ss.hasPermission('manage:grouping:query')") - public CommonResult> notJoinedGroupingPlateList(@Valid OrderModuleReqVO reqVO) { - - return success(groupingService.notJoinedGroupingPlateList(reqVO)); - - } - - - - - - - @GetMapping("/joinedPlate") - @Operation(summary = "查看订单的板材信息(已将加入包裹的板材信息)") - @PreAuthorize("@ss.hasPermission('manage:grouping:query')") - public CommonResult> joinedGroupPlateList(@Valid JoinedPlateReqVO reqVO) { - - return success(groupingService.joinedGroupPlateList(reqVO)); - - } - - - - - - - - @PutMapping("/insertPlate") - @Operation(summary = "包裹表新增板件(加入)") - @Parameter(name = "plateId", description = "板材id", required = true) - @PreAuthorize("@ss.hasPermission('manage:grouping:create')") - public CommonResult insertPackPlate(@Valid @RequestParam("plateId") Long plateId) { - - groupingService.insertPackPlate(plateId); - - return success(true); - - } - - - - - - @PutMapping("/update") - @Operation(summary = "移除包裹板材信息") - @Parameter(name = "plateId", description = "板材id", required = true) - @PreAuthorize("@ss.hasPermission('manage:grouping:update')") - public CommonResult removePackPlate(@Valid @RequestParam("plateId") Long plateId) { - - groupingService.removePackPlate(plateId); - - return success(true); - - } - - - - - - - @PostMapping("/insert") - @Operation(summary = "新增分堆(包裹)") - @PreAuthorize("@ss.hasPermission('manage:grouping:create')") - public CommonResult insertGrouping(@Valid @RequestBody OrderPackageReqVO packageReqVO) { - - return success(groupingService.insertGrouping(packageReqVO)); - - - } - - - - - - - - - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/ExportJsonReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/ExportJsonReqVO.java deleted file mode 100644 index 1a3b76734..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/ExportJsonReqVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping.vo; - - -import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import java.util.List; - -@Schema(description = "管理后台 - 数据导出 Request VO") -@Data -@ToString(callSuper = true) -public class ExportJsonReqVO { - - - @Schema(description = "板材信息", requiredMode = Schema.RequiredMode.REQUIRED) - private List Plates; - - - @Schema(description = "模块信息", requiredMode = Schema.RequiredMode.REQUIRED) - private List modules; - - @Schema(description = "已分堆", requiredMode = Schema.RequiredMode.REQUIRED) - private List alreadyGrouping; - - - @Schema(description = "未分堆", requiredMode = Schema.RequiredMode.REQUIRED) - private List notYetGrouping; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/GroupPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/GroupPlateReqVO.java deleted file mode 100644 index 741000ca1..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/GroupPlateReqVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 新增包裹板材信息 Request VO") -@Data -public class GroupPlateReqVO { - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "生产单号不能为空") - private Long orderNo; - - - @Schema(description = "板件id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "板件id不能为空") - private Long plateId; - - - @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "房间名称不能为空") - private String roomName; - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/JoinedPlateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/JoinedPlateReqVO.java deleted file mode 100644 index 3fc3a37a5..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/JoinedPlateReqVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping.vo; - - -import com.cf.imes.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import java.util.List; - -@Schema(description = "管理后台 - Request VO") -@Data -@ToString(callSuper = true) -public class JoinedPlateReqVO extends PageParam { - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long orderNo; - - - @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3,4,5") - private List packageIdList; - - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java deleted file mode 100644 index ca10c4031..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 生产单包裹表 order_package_{N}新增/修改 Request VO") -@Data -public class OrderPackageReqVO { - - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4399") - private Long id; - - - @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "生产单号不能为空") - private Long orderNo; - - -/* @Schema(description = "包裹编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "包裹编号不能为空") - private Long packageNo;*/ - - - @Schema(description = "包裹类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "包裹类型不能为空(0：板材)") - private Long type; - - - @Schema(description = "包裹名", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "包裹名不能为空") - private String name; - - - @Schema(description = "包裹状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - @NotNull(message = "包裹状态不能为空(默认为：0：未打包") - private Long status; - - - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private String remark; - - - - - -} 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 deleted file mode 100644 index 8019b7532..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cf.imes.module.manage.controller.admin.grouping.vo; - - -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.List; - -import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; - -@Schema(description = "管理后台 - 生产单表 order_{N} 分页 Request VO ") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class OrderPageReqVO extends PageParam { - - - @Schema(description = "生产单号") - private Long orderNo; - - @Schema(description = "自定义单号") - private String customOrderNo; - - @Schema(description = "客户") - private String customer; - - @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; - - @Schema(description = "结束时间",requiredMode = Schema.RequiredMode.REQUIRED) - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime[] endTime; - - @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 deleted file mode 100644 index d54cbfeb2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java +++ /dev/null @@ -1,61 +0,0 @@ -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") -@Data -public class OrderPlateListRespVO { - - - @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long orderNo; - - - @Schema(description = "生产单明细ID", requiredMode = Schema.RequiredMode.REQUIRED) - private Long ItemID; - - - @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9822") - private Long id; - - @Schema(description = "板名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String name; - - @Schema(description = "板材名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String plateName; - - @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED) - private String color; - - @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double width; - - @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double height; - - @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) - private Double thickness; - - @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板", requiredMode = Schema.RequiredMode.REQUIRED) - private String material; - - - @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String groupName; - - - @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String roomName; - - - @Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String bodyName; - - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - private String remark; - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java index 3dc8f17d2..5c4ef4f0b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java @@ -1,14 +1,12 @@ package com.cf.imes.module.manage.controller.admin.pack; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.common.pojo.CommonResult; 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.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPackageReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackageVO; import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java index e45ced424..77bd32f76 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PrintOrderPackRespVO.java @@ -1,7 +1,6 @@ package com.cf.imes.module.manage.controller.admin.pack.vo; -import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPlateListRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -38,7 +37,7 @@ public class PrintOrderPackRespVO { @Schema(description = "板材列表", requiredMode = Schema.RequiredMode.REQUIRED,example = "AABB") - private List plateList; + private List plateList; 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 1e70cd346..7152a7558 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 @@ -40,11 +40,12 @@ public class ProductionProcessController { @GetMapping("/select") - @Operation(summary = "查看组织的工序信息") - //@PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> getUserPage() { + @Operation(summary = "查看当前登录用户的组织的工序信息") + @Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1") + @PreAuthorize("@ss.hasPermission('manage:process:select')") + public CommonResult> getUserPage(@Valid @RequestParam("userId") Long userId) { - return success(productionProcessService.getProcess()); + return success(productionProcessService.getProcess(userId)); } @@ -76,7 +77,7 @@ public class ProductionProcessController { @GetMapping("/selectPlate") - @Operation(summary = "查看工序对应的板件信息") + @Operation(summary = "查看当前生产单的工序对应的板件信息") public CommonResult > selectPlate(@Valid ProcessPlateReqVO reqVO){ return success(productionProcessService.selectPlate(reqVO)); } @@ -84,8 +85,8 @@ public class ProductionProcessController { - @GetMapping("/selectBodyName") - @Operation(summary = "查询生产单对应的柜体名称") +// @GetMapping("/selectBodyName") +// @Operation(summary = "查询生产单对应的柜体名称") public CommonResult> selectBodyName(@Valid OrderBodyReqVO reqVO){ return success(productionProcessService.selectBodyName(reqVO)); 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 87fbd5c78..f67f98e55 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 @@ -51,9 +51,9 @@ public class ProductionStatusController { - @GetMapping("/page") - @Operation(summary = "生产状态查询分页") - @PreAuthorize("@ss.hasPermission('manage:query:query')") +// @GetMapping("/page") +// @Operation(summary = "生产状态查询分页") +// @PreAuthorize("@ss.hasPermission('manage:query:query')") public CommonResult> pageProductionStatus(@Valid OrderPlatePageReqVO pageReqVO){ PageResult pageResult = productionStatusService.getProductionPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProcessRespVO.class)); @@ -65,7 +65,7 @@ public class ProductionStatusController { @GetMapping("/select") @Operation(summary = "查看生产单下的工序组工序") @Parameter(name = "orderNo", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:query:query')") + @PreAuthorize("@ss.hasPermission('manage:query:select')") public CommonResult> selectProduction(@Valid @RequestParam("orderNo") Long orderNo){ List orderProcessById = productionStatusService.selectProduction(orderNo); @@ -78,9 +78,9 @@ public class ProductionStatusController { - @GetMapping("/selectPlateName") - @Operation(summary = "查看板材信息的组合名称") - @PreAuthorize("@ss.hasPermission('manage:query:query')") +// @GetMapping("/selectPlateName") +// @Operation(summary = "查看板材信息的组合名称") +// @PreAuthorize("@ss.hasPermission('manage:query:query')") public CommonResult> selectPlateName(@Valid OrderModuleReqVO reqVO){ return success(productionStatusService.selectPlateName(reqVO)); @@ -91,9 +91,9 @@ public class ProductionStatusController { - @GetMapping("/pagePlate") - @Operation(summary = "查看板材信息分页") - @PreAuthorize("@ss.hasPermission('manage:query:query')") +// @GetMapping("/pagePlate") +// @Operation(summary = "查看板材信息分页") +// @PreAuthorize("@ss.hasPermission('manage:query:query')") public CommonResult> queryPlate(@Valid PlatePageVO pageReqVO){ return success(productionStatusService.getOrderPlatePage(pageReqVO)); } @@ -104,7 +104,7 @@ public class ProductionStatusController { @GetMapping("/pageSalary") @Operation(summary = "计件工资分页查询") - @PreAuthorize("@ss.hasPermission('manage:query:query')") + @PreAuthorize("@ss.hasPermission('manage:query:pageSalary')") public CommonResult> StepSalary(@Valid PriceRatePageReqVO pageReqVO){ PageResult salaryPage = productionStatusService.getSalaryPage(pageReqVO); @@ -117,9 +117,9 @@ public class ProductionStatusController { - @GetMapping("/pagePackage") - @Operation(summary = "打包查询分页") - @PreAuthorize("@ss.hasPermission('manage:query:query')") +// @GetMapping("/pagePackage") +// @Operation(summary = "打包查询分页") +// @PreAuthorize("@ss.hasPermission('manage:query:query')") public CommonResult> queryPackage(@Valid OrderPlatePageReqVO pageReqVO){ PageResult pageResult = productionStatusService.queryPackage(pageReqVO); @@ -135,7 +135,7 @@ public class ProductionStatusController { @GetMapping("/queryPackageList") @Operation(summary = "生产单打包完成包裹查看") @Parameter(name = "orderNo", description = "生产单Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:query:query')") + @PreAuthorize("@ss.hasPermission('manage:query:queryPackageList')") public CommonResult> queryPackageList(@Valid @RequestParam("orderNo") Long orderNo){ List orderProcessById = productionStatusService.getPackageList(orderNo); @@ -148,10 +148,10 @@ public class ProductionStatusController { - @GetMapping("/queryPackageDetails") - @Operation(summary = "查看包裹详情分页") - @Parameter(name = "packId", description = "包裹Id", required = true) - @PreAuthorize("@ss.hasPermission('manage:query:query')") +// @GetMapping("/queryPackageDetails") +// @Operation(summary = "查看包裹详情分页") +// @Parameter(name = "packId", description = "包裹Id", required = true) +// @PreAuthorize("@ss.hasPermission('manage:query:query')") public CommonResult> queryPackageDetails(@Valid @RequestParam("packId") Long packId){ return null; 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/PriceRateReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java index a6a66ca52..378893bb4 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/salary/PriceRateReqVO.java @@ -12,7 +12,7 @@ public class PriceRateReqVO { @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED) private String name; - @Schema(description = "计件工资", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "单价", requiredMode = Schema.RequiredMode.REQUIRED) private Long priceRate; @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/dal/dataobject/process/ProcessUserDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/ProcessUserDO.java new file mode 100644 index 000000000..60328a078 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/ProcessUserDO.java @@ -0,0 +1,32 @@ +package com.cf.imes.module.manage.dal.dataobject.process; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +@TableName("imes_base.process_user") +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProcessUserDO { + + /** + * 工序 ID + */ + @TableId + private Long organId; + + /** + * 工序ID + */ + private Long processId; + /** + * 用户ID + */ + private Long userId; + + +} 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 index 4bef36208..ded41f352 100644 --- 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 @@ -1,16 +1,12 @@ package com.cf.imes.module.manage.dal.mysql.plate; -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.PatchingDetailReqVO; import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingDetailRespVO; import com.cf.imes.module.manage.controller.admin.patching.vo.PatchingPlatePageReqVO; import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessMapper.java index 44ee59802..5239876a2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessMapper.java @@ -3,8 +3,10 @@ package com.cf.imes.module.manage.dal.mysql.process; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; import com.cf.imes.module.manage.controller.admin.process.vo.UserProcessRespVO; import com.cf.imes.module.manage.dal.dataobject.process.ProcessDO; +import com.cf.imes.module.manage.dal.dataobject.process.ProcessUserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -20,12 +22,15 @@ import java.util.List; public interface ProcessMapper extends BaseMapperX { - default List selectProcessList(Long organId) { - return selectList(new LambdaQueryWrapperX() - .orderByDesc(ProcessDO::getId) - .eqIfPresent(ProcessDO::getOrganId, organId) - .eqIfPresent(ProcessDO::getIsEnabled, true)); + default List selectProcessList(Long organId,Long userId) { + return selectJoinList(ProcessDO.class, new MPJLambdaWrapperX() + .leftJoin(ProcessUserDO.class, ProcessUserDO::getProcessId, ProcessDO::getId) + .eq(ProcessUserDO::getUserId, userId) + .eq(ProcessDO::getOrganId, organId) + .eq(ProcessDO::getIsEnabled,true) + .selectAll(ProcessDO.class) + .orderByDesc(ProcessDO::getId)); + + } - - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessUserMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessUserMapper.java new file mode 100644 index 000000000..aafaf9137 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessUserMapper.java @@ -0,0 +1,12 @@ +package com.cf.imes.module.manage.dal.mysql.process; + + +import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.module.manage.dal.dataobject.process.ProcessUserDO; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProcessUserMapper extends BaseMapperX { + + +} 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 deb825dad..c02a4a0e3 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 @@ -1,14 +1,10 @@ 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.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 org.apache.ibatis.annotations.Param; @@ -24,20 +20,6 @@ import java.util.List; public interface ProductionProcessMapper extends BaseMapperX { - default PageResult selectPageList(OrderPageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eqIfPresent(OrderDO::getId,pageReqVO.getOrderNo()) - .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); - } - }) - .orderByDesc(OrderDO::getId)); - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java index 077299f12..90205d62b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java @@ -3,8 +3,6 @@ package com.cf.imes.module.manage.dal.mysql.query; 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.OrderPlateListRespVO; import com.cf.imes.module.manage.controller.admin.pack.vo.*; import com.cf.imes.module.manage.controller.admin.process.vo.OrderPlateReqVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPlateReqVO; @@ -12,11 +10,9 @@ import com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRe 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.OrderProcessStepItemNDO; import com.cf.imes.module.manage.dal.dataobject.query.OrderItemDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; import java.util.List; @@ -36,22 +32,8 @@ public interface OrderItemMapper extends BaseMapperX { List selectOrderPlateList(Long orderNo); - List selectGroupingPlateList(Long orderNo); - - - void insertPackPlate(Long plateId); - - - List selectJoinedGroupPlateList(@Param("orderNo") Long orderNo , @Param("packageIdList") List packageIdList); - - - - @Update("update order_item set package_id =0 where plate_id =#{plateId}") - void removePackPlate(Long plateId); - - - List selectPrintPlateList(@Param("orderNo")Long orderNo,@Param("packageNo") Long packageNo); + List selectPrintPlateList(@Param("orderNo")Long orderNo,@Param("packageNo") Long packageNo); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java index 8f4ea6b4c..711e64bf5 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java @@ -35,11 +35,6 @@ public interface ProductionStatusMapper extends BaseMapperX { -/* default PageResult selectPackage(OrderPlatePageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .orderByDesc(OrderDO::getId)); - }*/ - diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingService.java deleted file mode 100644 index babb0d2bc..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.manage.service.grouping; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.grouping.vo.*; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; - -import java.util.List; - -public interface GroupingService { - - - // 查询订单 - PageResult getGroupingList( OrderPageReqVO pageReqVO); - - - // 新增包裹 - Long insertGrouping(OrderPackageReqVO packageReqVO); - - - // 查看订单的板材信息(未加入包裹的板材信息) - PageResult notJoinedGroupingPlateList(OrderModuleReqVO reqVO); - - - // 包裹表新增板件 - void insertPackPlate(Long plateId); - - - // 查看订单的板材信息(已将加入包裹的板材信息) - PageResult joinedGroupPlateList(JoinedPlateReqVO reqVO); - - - // 移除包裹板材信息 - void removePackPlate(Long plateId); -} 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 deleted file mode 100644 index aecf7fbf2..000000000 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.cf.imes.module.manage.service.grouping; - - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.common.util.object.PageUtils; -import com.cf.imes.module.manage.controller.admin.grouping.vo.*; -import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO; -import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; -import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; -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.ProductionProcessMapper; -import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; -import com.cf.imes.module.manage.util.packageNo.PackageNoUtil; -import com.cf.imes.module.manage.util.page.PageHelperUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; - -@Service -@Validated -public class GroupingServiceImpl implements GroupingService{ - - - @Resource - private ProductionProcessMapper productionProcessMapper; - - - @Resource - private OrderPackageMapper orderPackageMapper; - - @Resource - private OrderItemMapper orderItemMapper; - - - - // 查询订单分页 - @Override - public PageResult getGroupingList(OrderPageReqVO pageReqVO) { - - return productionProcessMapper.selectPageList(pageReqVO); - - - } - - - - // 新增包裹 - @Override - public Long insertGrouping(OrderPackageReqVO packageReqVO) { - - // - OrderPackageDO packageDO = BeanUtils.toBean(packageReqVO, OrderPackageDO.class); - packageDO.setPackageNo(PackageNoUtil.randomPageNo()); - - orderPackageMapper.insert(packageDO); - - return packageDO.getId(); - } - - - - - // 查看订单的板材信息 - @Override - public PageResult notJoinedGroupingPlateList(OrderModuleReqVO reqVO) { - - // - PageHelper.startPage(reqVO.getPageNo(),reqVO.getPageSize()); - List orderPlateListRespVOS = orderItemMapper.selectGroupingPlateList(reqVO.getOrderNo()); - PageInfo pageInfo = new PageInfo<>(orderPlateListRespVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - - return priceRateReqVOPageResult; - - } - - - - - // 包裹表新增板件 - @Override - public void insertPackPlate(Long plateId) { - - orderItemMapper.insertPackPlate(plateId); - - } - - - - - - // 查看订单的板材信息(已将加入包裹的板材信息) - @Override - public PageResult joinedGroupPlateList(JoinedPlateReqVO reqVO) { - - - PageHelper.startPage(reqVO.getPageNo(),reqVO.getPageSize()); - List orderPlateListRespVOS = orderItemMapper.selectJoinedGroupPlateList(reqVO.getOrderNo(), reqVO.getPackageIdList()); - - PageInfo pageInfo = new PageInfo<>(orderPlateListRespVOS); - PageResult priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo); - - return priceRateReqVOPageResult; - - } - - - - - // 移除包裹板材信息 - @Override - public void removePackPlate(Long plateId) { - - - orderItemMapper.removePackPlate(plateId); - - - } - - -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java index 9327bc2c4..d787f24c2 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java @@ -2,7 +2,6 @@ package com.cf.imes.module.manage.service.pack; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPackageReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO; @@ -81,7 +80,6 @@ public interface PackService { OrderPartsRespVO addNewOtherParts(OtherPackReqVO reqVO); - Long testpack(OrderPackageReqVO reqVO); // 删除配件包裹中的配件(删除某一个) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 35bd49415..6c45dd305 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -1,15 +1,12 @@ package com.cf.imes.module.manage.service.pack; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; + import com.cf.imes.framework.common.enums.OrderPackageStatusEnum; import com.cf.imes.framework.common.enums.OrderPackageTypeEnum; 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.grouping.vo.OrderPackageReqVO; import com.cf.imes.module.manage.controller.admin.pack.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; import com.cf.imes.module.manage.dal.dataobject.pack.OrderBodyDO; @@ -199,7 +196,7 @@ public class PackServiceImpl implements PackService { } } - // 当传入的包裹ID为 -1 ，走新增的逻辑 + OrderPackageDO orderPackageDO = new OrderPackageDO(); orderPackageDO.setOrderNo(packageVO.getOrderId()); @@ -251,6 +248,7 @@ public class PackServiceImpl implements PackService { public List selectPack(Long orderId) { List orderPackageDOS = orderPackageMapper.selectPackStatus(orderId); +// List collect = orderPackageDOS.stream().map(o -> o.setRemark(JsonUtils.unzipString(o.getRemark()))).collect(Collectors.toList()); return BeanUtils.toBean(orderPackageDOS, OrderPackRespVO.class); } @@ -367,14 +365,6 @@ public class PackServiceImpl implements PackService { - @Override - public Long testpack(OrderPackageReqVO reqVO) { - - OrderPackageDO packageDO = BeanUtils.toBean(reqVO, OrderPackageDO.class); - orderPackageMapper.insert(packageDO); - return packageDO.getId(); - } - 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 8e8532a36..14091380a 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 @@ -12,7 +12,7 @@ public interface ProductionProcessService { // 查看组织的工序信息 - List getProcess(); + List getProcess(Long userId); // 生产工序单分页查询 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 d774b36bd..1e7c7213c 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 @@ -17,10 +17,7 @@ import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import com.cf.imes.module.manage.dal.dataobject.process.ProcessDO; import com.cf.imes.module.manage.dal.dataobject.query.OrderItemDO; import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessStepItemMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper; -import com.cf.imes.module.manage.dal.mysql.process.ProductionProcessMapper; +import com.cf.imes.module.manage.dal.mysql.process.*; import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; import com.cf.imes.module.manage.util.page.PageHelperUtil; import com.cf.imes.module.system.enums.ErrorCodeConstants; @@ -76,11 +73,11 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { // 查看组织的工序信息 @Override - public List getProcess() { + public List getProcess(Long userId) { // 获取组织id Long organId = OrganContextHolder.getOrganId(); - return processMapper.selectProcessList(organId); + return processMapper.selectProcessList(organId,userId); } 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 ab6d41edc..16d1b0a6a 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 @@ -108,7 +108,6 @@ - @@ -166,136 +165,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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}; - - - - - - - - - - -