Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

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;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/GroupingController.java

@@ -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<PageResult<ProcessRespVO>> getGroupingList(@Valid OrderPageReqVO pageReqVO) {
-
-        PageResult<OrderDO> groupingList = groupingService.getGroupingList(pageReqVO);
-
-        return success(BeanUtils.toBean(groupingList, ProcessRespVO.class));
-
-    }
-
-
-
-
-
-
-    @GetMapping("/notJoinedPlate")
-    @Operation(summary = "查看订单的板材信息(未加入包裹的板材信息)")
-    @PreAuthorize("@ss.hasPermission('manage:grouping:query')")
-    public CommonResult<PageResult<OrderPlateListRespVO>> notJoinedGroupingPlateList(@Valid OrderModuleReqVO reqVO) {
-
-        return success(groupingService.notJoinedGroupingPlateList(reqVO));
-
-    }
-
-
-
-
-
-
-    @GetMapping("/joinedPlate")
-    @Operation(summary = "查看订单的板材信息(已将加入包裹的板材信息)")
-    @PreAuthorize("@ss.hasPermission('manage:grouping:query')")
-    public CommonResult<PageResult<OrderPlateListRespVO>> 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<Boolean>  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<Boolean>  removePackPlate(@Valid @RequestParam("plateId") Long plateId) {
-
-        groupingService.removePackPlate(plateId);
-
-        return success(true);
-
-    }
-
-
-
-
-
-
-    @PostMapping("/insert")
-    @Operation(summary = "新增分堆(包裹)")
-    @PreAuthorize("@ss.hasPermission('manage:grouping:create')")
-    public CommonResult<Long> insertGrouping(@Valid @RequestBody OrderPackageReqVO packageReqVO) {
-
-        return success(groupingService.insertGrouping(packageReqVO));
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/ExportJsonReqVO.java

@@ -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<OrderPlateListRespVO>  Plates;
-
-
-    @Schema(description = "模块信息", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<OrderModuleVO>  modules;
-
-    @Schema(description = "已分堆", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<Long>  alreadyGrouping;
-
-
-    @Schema(description = "未分堆", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<Long>  notYetGrouping;
-
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/GroupPlateReqVO.java

@@ -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;
-
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/JoinedPlateReqVO.java

@@ -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<Long> packageIdList;
-
-
-
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPackageReqVO.java

@@ -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;
-
-
-
-
-
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPageReqVO.java

@@ -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<Long> statusList;
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/grouping/vo/OrderPlateListRespVO.java

@@ -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;
-
-
-}

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;

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<OrderPlateListRespVO> plateList;
+    private List<PlateDetailsRespVO> plateList;
 
 
 

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 = "查看组织的工序信息")
+    @Operation(summary = "查看当前登录用户的组织的工序信息")
-    //@PreAuthorize("@ss.hasPermission('manage:process:query')")
+    @Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1")
-    public CommonResult<List<ProcessDO>> getUserPage() {
+    @PreAuthorize("@ss.hasPermission('manage:process:select')")
+    public CommonResult<List<ProcessDO>> 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<List<OrderPlateReqVO> > selectPlate(@Valid ProcessPlateReqVO reqVO){
         return success(productionProcessService.selectPlate(reqVO));
     }
@@ -84,8 +85,8 @@ public class ProductionProcessController {
 
 
 
-    @GetMapping("/selectBodyName")
+//    @GetMapping("/selectBodyName")
-    @Operation(summary = "查询生产单对应的柜体名称")
+//    @Operation(summary = "查询生产单对应的柜体名称")
     public CommonResult<List<OrderBodyRespVo>> selectBodyName(@Valid OrderBodyReqVO reqVO){
         return success(productionProcessService.selectBodyName(reqVO));
 

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")
+//    @GetMapping("/page")
-    @Operation(summary = "生产状态查询分页")
+//    @Operation(summary = "生产状态查询分页")
-    @PreAuthorize("@ss.hasPermission('manage:query:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:query:query')")
     public CommonResult<PageResult<ProcessRespVO>> pageProductionStatus(@Valid OrderPlatePageReqVO pageReqVO){
         PageResult<OrderDO> 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<List<ProductionGroupVO>> selectProduction(@Valid @RequestParam("orderNo") Long orderNo){
 
         List<ProductionGroupVO> orderProcessById = productionStatusService.selectProduction(orderNo);
@@ -78,9 +78,9 @@ public class ProductionStatusController {
 
 
 
-    @GetMapping("/selectPlateName")
+//    @GetMapping("/selectPlateName")
-    @Operation(summary = "查看板材信息的组合名称")
+//    @Operation(summary = "查看板材信息的组合名称")
-    @PreAuthorize("@ss.hasPermission('manage:query:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:query:query')")
     public CommonResult<List<OrderModuleVO>> selectPlateName(@Valid OrderModuleReqVO reqVO){
 
         return success(productionStatusService.selectPlateName(reqVO));
@@ -91,9 +91,9 @@ public class ProductionStatusController {
 
 
 
-    @GetMapping("/pagePlate")
+//    @GetMapping("/pagePlate")
-    @Operation(summary = "查看板材信息分页")
+//    @Operation(summary = "查看板材信息分页")
-    @PreAuthorize("@ss.hasPermission('manage:query:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:query:query')")
     public CommonResult<PageResult<OrderPlateRespVO>> 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<PageResult<PriceRateReqVO>> StepSalary(@Valid PriceRatePageReqVO pageReqVO){
 
         PageResult<PriceRateReqVO> salaryPage = productionStatusService.getSalaryPage(pageReqVO);
@@ -117,9 +117,9 @@ public class ProductionStatusController {
 
 
 
-    @GetMapping("/pagePackage")
+//    @GetMapping("/pagePackage")
-    @Operation(summary = "打包查询分页")
+//    @Operation(summary = "打包查询分页")
-    @PreAuthorize("@ss.hasPermission('manage:query:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:query:query')")
     public CommonResult<PageResult<ProcessRespVO>>  queryPackage(@Valid OrderPlatePageReqVO pageReqVO){
 
         PageResult<OrderDO> 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<List<OrderPackageVO>> queryPackageList(@Valid @RequestParam("orderNo") Long orderNo){
 
         List<OrderPackageVO> orderProcessById = productionStatusService.getPackageList(orderNo);
@@ -148,10 +148,10 @@ public class ProductionStatusController {
 
 
 
-    @GetMapping("/queryPackageDetails")
+//    @GetMapping("/queryPackageDetails")
-    @Operation(summary = "查看包裹详情分页")
+//    @Operation(summary = "查看包裹详情分页")
-    @Parameter(name = "packId", description = "包裹Id", required = true)
+//    @Parameter(name = "packId", description = "包裹Id", required = true)
-    @PreAuthorize("@ss.hasPermission('manage:query:query')")
+//    @PreAuthorize("@ss.hasPermission('manage:query:query')")
     public CommonResult<List<PackageDetailsRespVO>>  queryPackageDetails(@Valid @RequestParam("packId") Long packId){
 
         return null;

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)

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;
+
+
+}

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;
 

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<ProcessDO> {
 
 
-    default List<ProcessDO> selectProcessList(Long organId) {
+    default List<ProcessDO> selectProcessList(Long organId,Long userId) {
-        return selectList(new LambdaQueryWrapperX<ProcessDO>()
+        return selectJoinList(ProcessDO.class, new MPJLambdaWrapperX<ProcessDO>()
-                .orderByDesc(ProcessDO::getId)
+                .leftJoin(ProcessUserDO.class, ProcessUserDO::getProcessId, ProcessDO::getId)
-                .eqIfPresent(ProcessDO::getOrganId, organId)
+                .eq(ProcessUserDO::getUserId, userId)
-                .eqIfPresent(ProcessDO::getIsEnabled, true));
+                .eq(ProcessDO::getOrganId, organId)
+                .eq(ProcessDO::getIsEnabled,true)
+                .selectAll(ProcessDO.class)
+                .orderByDesc(ProcessDO::getId));
+
+
     }
-
-
 }

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<ProcessUserDO> {
+
+
+}

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<OrderDO> {
 
 
-    default PageResult<OrderDO> selectPageList(OrderPageReqVO pageReqVO) {
-        return selectPage(pageReqVO, new LambdaQueryWrapperX<OrderDO>()
-                .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));
-    }
 
 
 

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<OrderItemDO> {
     List<PlateDetailsRespVO> selectOrderPlateList(Long orderNo);
 
 
-    List<OrderPlateListRespVO> selectGroupingPlateList(Long orderNo);
 
-
+    List<PlateDetailsRespVO> selectPrintPlateList(@Param("orderNo")Long orderNo,@Param("packageNo") Long packageNo);
-
-    void insertPackPlate(Long plateId);
-
-
-    List<OrderPlateListRespVO> selectJoinedGroupPlateList(@Param("orderNo") Long orderNo , @Param("packageIdList") List<Long> packageIdList);
-
-
-
-    @Update("update order_item set package_id =0 where plate_id =#{plateId}")
-    void removePackPlate(Long plateId);
-
-
-    List<OrderPlateListRespVO> selectPrintPlateList(@Param("orderNo")Long orderNo,@Param("packageNo") Long packageNo);
 
 
 

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<OrderDO> {
 
 
 
-/*    default PageResult<OrderDO> selectPackage(OrderPlatePageReqVO pageReqVO) {
-        return selectPage(pageReqVO, new LambdaQueryWrapperX<OrderDO>()
-                .orderByDesc(OrderDO::getId));
-    }*/
-
 
 
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingService.java

@@ -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<OrderDO> getGroupingList( OrderPageReqVO pageReqVO);
-
-
-    // 新增包裹
-    Long insertGrouping(OrderPackageReqVO packageReqVO);
-
-
-    // 查看订单的板材信息(未加入包裹的板材信息)
-    PageResult<OrderPlateListRespVO> notJoinedGroupingPlateList(OrderModuleReqVO reqVO);
-
-
-    // 包裹表新增板件
-    void insertPackPlate(Long plateId);
-
-
-    // 查看订单的板材信息(已将加入包裹的板材信息)
-    PageResult<OrderPlateListRespVO> joinedGroupPlateList(JoinedPlateReqVO reqVO);
-
-
-    // 移除包裹板材信息
-    void removePackPlate(Long plateId);
-}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/grouping/GroupingServiceImpl.java

@@ -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<OrderDO> 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<OrderPlateListRespVO> notJoinedGroupingPlateList(OrderModuleReqVO reqVO) {
-
-        //
-        PageHelper.startPage(reqVO.getPageNo(),reqVO.getPageSize());
-        List<OrderPlateListRespVO> orderPlateListRespVOS = orderItemMapper.selectGroupingPlateList(reqVO.getOrderNo());
-        PageInfo<OrderPlateListRespVO> pageInfo = new PageInfo<>(orderPlateListRespVOS);
-        PageResult<OrderPlateListRespVO> priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo);
-
-        return priceRateReqVOPageResult;
-
-    }
-
-
-
-
-    // 包裹表新增板件
-    @Override
-    public void insertPackPlate(Long plateId) {
-
-        orderItemMapper.insertPackPlate(plateId);
-
-    }
-
-
-
-
-
-    // 查看订单的板材信息(已将加入包裹的板材信息)
-    @Override
-    public PageResult<OrderPlateListRespVO> joinedGroupPlateList(JoinedPlateReqVO reqVO) {
-
-
-        PageHelper.startPage(reqVO.getPageNo(),reqVO.getPageSize());
-        List<OrderPlateListRespVO> orderPlateListRespVOS = orderItemMapper.selectJoinedGroupPlateList(reqVO.getOrderNo(), reqVO.getPackageIdList());
-
-        PageInfo<OrderPlateListRespVO> pageInfo = new PageInfo<>(orderPlateListRespVOS);
-        PageResult<OrderPlateListRespVO> priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo);
-
-        return priceRateReqVOPageResult;
-
-    }
-
-
-
-
-    // 移除包裹板材信息
-    @Override
-    public void removePackPlate(Long plateId) {
-
-
-        orderItemMapper.removePackPlate(plateId);
-
-
-    }
-
-
-}

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);
 
 
     // 删除配件包裹中的配件(删除某一个)

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<OrderPackRespVO> selectPack(Long orderId) {
 
         List<OrderPackageDO> orderPackageDOS = orderPackageMapper.selectPackStatus(orderId);
+//        List<OrderPackageDO> 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();
-    }
-
 
 
 

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<ProcessDO> getProcess();
+    List<ProcessDO> getProcess(Long userId);
 
 
     // 生产工序单分页查询

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.*;
-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.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<ProcessDO> getProcess() {
+    public List<ProcessDO> getProcess(Long userId) {
 
         // 获取组织id
         Long organId = OrganContextHolder.getOrganId();
-        return processMapper.selectProcessList(organId);
+        return processMapper.selectProcessList(organId,userId);
 
     }
 

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 @@
     </select>
 
 
-    <!--where oi.body_id = #{bodyId}-->
 
 
     <resultMap id="PlateDetailsMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
@@ -166,136 +165,26 @@
 
 
 
-    <resultMap id="PlateListMap" type="com.cf.imes.module.manage.controller.admin.grouping.vo.OrderPlateListRespVO">
-
-        <result property="orderNo" column="orderNo"/>
-        <result property="id" column="plateId"/>
-        <result property="name" column=""/>
-        <result property="name" column="plateName"/>
-        <result property="plateName" column="goodsName"/>
-        <result property="height" column="height"/>
-        <result property="width" column="width"/>
-        <result property="thickness" column="thickness"/>
-        <result property="material" column="material"/>
-        <result property="color" column="color"/>
-        <result property="groupName" column="groupName"/>
-        <result property="roomName" column="roomName"/>
-        <result property="bodyName" column="bodyName"/>
-        <result property="remark" column="remark"/>
-
-    </resultMap>
-    <select id="selectGroupingPlateList"
-            parameterType="java.lang.Long"
-            resultMap="PlateListMap">
-
-        select
-            oi.order_id as orderNo,
-            op.id as plateId,
-            op.height as height,
-            op.width as width,
-            op.thickness as thickness,
-            op.name as plateName,
-            p.goods_name as goodsName,
-            p.material as material,
-            p.color as color,
-            ob.name as bodyName,
-            ob.room_name as roomName,
-            og.name as groupName,
-            op.remark as remark
-
-        from order_item oi
-
-                 join order_body ob on oi.body_id = ob.id
-                 join order_group og on oi.group_id = og.id
-                 join order_plate op on oi.plate_id = op.id
-                 join plate p on op.goods_id = p.goods_id
-
-        where oi.order_id = #{orderNo};
-
-    </select>
-
-
-    <update id="insertPackPlate"
-            parameterType="java.lang.Long">
-
-        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>
-
-
-
-
-     <select id="selectJoinedGroupPlateList"
-             parameterType="java.lang.Long"
-             resultMap="PlateListMap">
-
-         select
-
-             oi.order_id as orderNo,
-             op.id as plateId,
-             op.height as height,
-             op.width as width,
-             op.thickness as thickness,
-             op.name as plateName,
-             p.goods_name as goods_name,
-             p.material as material,
-             p.color as color,
-             ob.name as bodyName,
-             ob.room_name as roomName,
-             og.name as groupName,
-             op.remark as remark
-
-         from order_item oi
-
-                  join order_body ob on oi.body_id = ob.id
-                  join order_group og on oi.group_id = og.id
-                  join order_plate op on oi.plate_id = op.id
-                  join plate p on op.goods_id = p.goods_id
-
-         where oi.package_id  in
-         <foreach item="id" collection="packageIdList" open="(" separator="," close=")">
-             #{id}
-         </foreach>
-           and oi.order_id = #{orderNo};
-
-
-     </select>
-
-
-
 
     <select id="selectPrintPlateList"
             parameterType="java.lang.Long"
-            resultMap="PlateListMap">
+            resultMap="PlateDetailsMap">
 
         select
-            oi.order_id as orderNo,
+            op.plate_no as plateId,
-            op.id as plateId,
+            op.height as plateHeight,
-            op.height as height,
+            op.width as plateWidth,
-            op.width as width,
+            op.thickness as plateThickness,
-            op.thickness as thickness,
             op.name as plateName,
-            p.goods_name as goodsName,
+            og.material as plateMaterial,
-            p.material as material,
+            og.color as plateColor,
-            p.color as color,
             ob.name as bodyName,
-            ob.room_name as roomName,
+            ob.room_name as roomName
-            og.name as groupName,
-            op.remark as remark
 
         from order_item oi
                  join order_body ob on oi.body_id = ob.id
-                 join order_group og on oi.group_id = og.id
                  join order_plate op on oi.plate_id = op.id
-                 join plate p on op.goods_id = p.goods_id
+                 join order_goods og on op.goods_id = og.id
 
         where oi.order_id = #{orderNo} and oi.package_id = #{packageNo};
     </select>