diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java index 0063292..4f0ec39 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -82,5 +82,12 @@ public interface CommonConstant { */ Integer API_SCOPE_CATEGORY = 2; - + /** + * 删除状态, 未删除 + */ + Integer DELETE_FALSE = 0; + /** + * 删除状态, 已删除 + */ + Integer DELETE_TRUE = 1; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java index 1c30a93..0e0be10 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/MoldPlanOrder.java @@ -21,5 +21,5 @@ public class MoldPlanOrder extends BaseEntity { * 烧结模具计划ID */ @TableField(value = "MP_ID") - private Long mp_id; + private Long mpId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java index ea4ea5d..17a0bea 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsApply.java @@ -6,6 +6,7 @@ import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import java.math.BigDecimal; +import java.util.Date; /** * 镀层物料申报添加量 @@ -31,11 +32,29 @@ public class PlateGoodsApply extends BaseEntity { @TableField(value = "GOODS_DEMAND") private BigDecimal goodsDemand; + /** + * 审批人 + */ + @TableField(value = "APPROVAL_MAN") + private Long approvalMan; + + /** + * 审批时间 + */ + @TableField(value = "APPROVAL_TIME") + private Date approvalTime; + /** * 审批状态 */ @TableField(value = "APPROVAL_STATUS") - private Long approvalStatus; + private Integer approvalStatus; + + /** + * 审批结果 + */ + @TableField(value = "APPROVAL_MEMO") + private String approvalMemo; /** * 采购Id diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java index 36ad0d8..e55c1c9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecord.java @@ -66,7 +66,7 @@ public class PlateGoodsRecord extends BaseEntity { * 审批状态 */ @TableField(value = "APPROVAL_STATUS") - private Long approvalStatus; + private Integer approvalStatus; /** * 审批结果 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java index 3755cdf..9dca553 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/PlateGoodsRecordDetail.java @@ -21,12 +21,12 @@ public class PlateGoodsRecordDetail extends BaseEntity { * 申报ID */ @TableField(value = "PGRD_ID") - private Long pgrd_id; + private Long pgrdId; /** * 生产订单ID */ @TableField(value = "YO_ID") - private String yo_id; + private String yoId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java index 1a82edc..0aa2f94 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/entity/YieldOrder.java @@ -157,13 +157,13 @@ public class YieldOrder extends BaseEntity { * 优先级-排产 */ @TableField(value = "PRIORITY_APS") - private Long priorityAps; + private Integer priorityAps; /** * 优先级-erp中订单优先级 */ @TableField(value = "PRIORITY_ERP") - private Long priorityErp; + private Integer priorityErp; /** * 保管员 @@ -314,7 +314,7 @@ public class YieldOrder extends BaseEntity { * 校验结果，0：通过，1：数据缺失，2：工艺缺失，3：资源缺失，2：交期冲突 */ @TableField(value = "VALIDATION_RESULT") - private Short validationResult; + private Integer validationResult; /** * 校验描述 */ @@ -332,4 +332,10 @@ public class YieldOrder extends BaseEntity { */ @TableField(value = "VALIDATION_USER") private Long validationUser; + + /** + * 接收状态, 0：未接收，1：已接收 + */ + @TableField(value = "RECEIVE_STATUS") + private Integer receiveStatus; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/AssayContentSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/AssayContentSave.java new file mode 100644 index 0000000..6184028 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/AssayContentSave.java @@ -0,0 +1,25 @@ +package org.springblade.desk.order.request; + +import lombok.Data; +import org.springblade.desk.order.entity.AssayContent; +import org.springblade.desk.order.entity.AssayContentDetail; + +import java.util.List; + +/** + * 化验含量 - 保存请求参数 + * + * @author lqk + */ +@Data +public class AssayContentSave { + /** + * 化验含量 + */ + private AssayContent assayContent; + + /** + * 化验含量明细 + */ + private List detailList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/MoldPlanSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/MoldPlanSave.java new file mode 100644 index 0000000..fdcc2ac --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/MoldPlanSave.java @@ -0,0 +1,31 @@ +package org.springblade.desk.order.request; + +import lombok.Data; +import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.entity.MoldPlanOrder; +import org.springblade.desk.order.entity.MoldPlanTool; + +import java.util.List; + +/** + * 烧结模具计划 - 保存请求参数 + * + * @author lqk + */ +@Data +public class MoldPlanSave { + /** + * 烧结模具计划 + */ + private MoldPlan moldPlan; + + /** + * 关联订单明细 + */ + private List orderList; + + /** + * 关联工装明细 + */ + private List toolList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsApplySave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsApplySave.java new file mode 100644 index 0000000..e4a9ff8 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsApplySave.java @@ -0,0 +1,25 @@ +package org.springblade.desk.order.request; + +import lombok.Data; +import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; + +import java.util.List; + +/** + * 镀层物料申报 - 保存请求参数 + * + * @author lqk + */ +@Data +public class PlateGoodsApplySave { + /** + * 化验含量 + */ + private PlateGoodsApply assayContent; + + /** + * 化验含量明细 + */ + private List detailList; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsRecordSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsRecordSave.java new file mode 100644 index 0000000..f7e92a6 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/request/PlateGoodsRecordSave.java @@ -0,0 +1,25 @@ +package org.springblade.desk.order.request; + +import lombok.Data; +import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; + +import java.util.List; + +/** + * 镀层物料需求 - 保存请求参数 + * + * @author lqk + */ +@Data +public class PlateGoodsRecordSave { + /** + * 化验含量 + */ + private PlateGoodsRecord assayContent; + + /** + * 化验含量明细 + */ + private List detailList; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java new file mode 100644 index 0000000..80ae664 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.constant; + +/** + * 烧结模具计划相关常量 + * + * @author lqk + * @date 2025-11-27 10:40 + */ +public interface MoldPlanConst { + //region 状态相关常量 + /** + * 待出库 + */ + Integer STATUS_WAITING = 0; + /** + * 已出库 + */ + Integer STATUS_OUT_STORE = 1; + /** + * 完成 + */ + Integer STATUS_DONE = 2; + /** + * 关闭 + */ + Integer STATUS_CLOSE = 3; + //endregion +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java new file mode 100644 index 0000000..cb71e36 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java @@ -0,0 +1,40 @@ +package org.springblade.desk.order.constant; + +/** + * 镀层物料需求相关常量 + * + * @author lqk + * @date 2025-11-27 10:40 + */ +public interface PlateGoodsConst { + //region 状态相关常量 + /** + * 待审核 + */ + Integer STATUS_WAITING = 0; + /** + * 审核通过 + */ + Integer STATUS_PASS = 1; + /** + * 使用中 + */ + Integer STATUS_USING = 2; + /** + * 已超期 + */ + Integer STATUS_OUT_DATE = 2; + /** + * 已完成 + */ + Integer STATUS_DONE = 3; + /** + * 审核未通过 + */ + Integer STATUS_NOT_PASS = 3; + /** + * 已关闭 + */ + Integer STATUS_CLOSE = 3; + //endregion +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java index 6262677..c280fac 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java @@ -59,87 +59,87 @@ public interface YieldOrderConst { /** * 热表订单 */ - Short YIELD_TYPE_1 = 1; + Integer YIELD_TYPE_1 = 1; /** * 烧结订单 */ - Short YIELD_TYPE_2 = 2; + Integer YIELD_TYPE_2 = 2; /** * 玻璃饼 */ - Short YIELD_TYPE_3 = 3; + Integer YIELD_TYPE_3 = 3; /** * 壳体 */ - Short YIELD_TYPE_4 = 4; + Integer YIELD_TYPE_4 = 4; /** * 插针 */ - Short YIELD_TYPE_5 = 5; + Integer YIELD_TYPE_5 = 5; /** * 石墨模 */ - Short YIELD_TYPE_6 = 6; + Integer YIELD_TYPE_6 = 6; //endregion //region 生产订单业务类型 /** * 热表 */ - Short BUSINESS_TYPE_RB = 1; + Integer BUSINESS_TYPE_RB = 1; /** * 外协 */ - Short BUSINESS_TYPE_WX = 2; + Integer BUSINESS_TYPE_WX = 2; /** * 烧结 */ - Short BUSINESS_TYPE_SJ = 3; + Integer BUSINESS_TYPE_SJ = 3; //endregion //region 生产订单 ERP优先级 /** * 正常 */ - Short PRIORITY_ERP_NORMAL = 1; + Integer PRIORITY_ERP_NORMAL = 1; /** * 项目要求日期急件 */ - Short PRIORITY_ERP_PRO_IMP = 2; + Integer PRIORITY_ERP_PRO_IMP = 2; /** * 合同急件 */ - Short PRIORITY_ERP_PACT_IMP = 3; + Integer PRIORITY_ERP_PACT_IMP = 3; /** * 会议绩效急件 */ - Short PRIORITY_ERP_PERF_IMP = 4; + Integer PRIORITY_ERP_PERF_IMP = 4; /** * 调度标注急件 */ - Short PRIORITY_ERP_SCH_IMP = 5; + Integer PRIORITY_ERP_SCH_IMP = 5; //endregion //region 生产订单 校验结果，0：通过，1：数据缺失，2：工艺缺失，3：资源缺失，2：交期冲突 /** * 通过 */ - Short VALIDATION_RESULT_PASS = 0; + Integer VALIDATION_RESULT_PASS = 0; /** * 数据缺失 */ - Short VALIDATION_RESULT_LESS_DATA = 1; + Integer VALIDATION_RESULT_LESS_DATA = 1; /** * 工艺缺失 */ - Short VALIDATION_RESULT_LESS_CRAFT = 2; + Integer VALIDATION_RESULT_LESS_CRAFT = 2; /** * 资源缺失 */ - Short VALIDATION_RESULT_LESS_RESOURCE = 3; + Integer VALIDATION_RESULT_LESS_RESOURCE = 3; /** * 交期冲突 */ - Short VALIDATION_RESULT_CONFLICT = 4; + Integer VALIDATION_RESULT_DELIVERY = 4; //endregion } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java index 86661d2..9dc02ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java @@ -1,7 +1,6 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -15,11 +14,15 @@ import org.springblade.core.secure.annotation.IsAdministrator; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.entity.AssayContent; import org.springblade.desk.order.entity.AssayContentDetail; +import org.springblade.desk.order.request.AssayContentSave; import org.springblade.desk.order.service.IAssayContentDetailService; import org.springblade.desk.order.service.IAssayContentService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 化验含量 * @@ -34,28 +37,26 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "化验含量", description = "接口") public class AssayContentController extends BladeController { - private final IAssayContentDetailService assayContentDetailService; private final IAssayContentService assayContentService; + private final IAssayContentDetailService assayContentDetailService; - /** - * 分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 1) - @Operation(summary = "分页", description = "") - public R> page(AssayContentDetail entity, Query query) { - IPage page = assayContentDetailService.selectPage(Condition.getPage(query), entity); - return R.data(page); - } + /** + * 分页 + */ + @GetMapping("/page") + @Operation(summary = "分页", description = "") + public R> page(AssayContent entity, Query query) { + IPage page = assayContentService.selectPage(Condition.getPage(query), entity); + return R.data(page); + } /** * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") - public R detail(String id) { - AssayContentDetail detail = assayContentDetailService.getById(id); + public R detail(String id) { + AssayContent detail = assayContentService.getById(id); return R.data(detail); } @@ -63,10 +64,11 @@ public class AssayContentController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") - public R save(@Valid @RequestBody AssayContentDetail entity) { - assayContentDetailService.save(entity); + public R save(@Valid @RequestBody AssayContentSave saveData) { + AssayContent entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + assayContentService.save(entity, detailList); return R.status(true); } @@ -74,10 +76,11 @@ public class AssayContentController extends BladeController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") - public R update(@Valid @RequestBody AssayContentDetail entity) { - assayContentDetailService.updateById(entity); + public R update(@Valid @RequestBody AssayContentSave saveData) { + AssayContent entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + assayContentService.update(entity, detailList); return R.status(true); } @@ -85,19 +88,18 @@ public class AssayContentController extends BladeController { * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 6) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(assayContentDetailService.deleteLogic(Func.toLongList(ids))); + Boolean result = assayContentService.deleteLogic(Func.toLongList(ids)); + return R.status(result); } /** * 列表 - 未使用的化验含量 */ @GetMapping("/listNoUsed") - @ApiOperationSupport(order = 1) @Operation(summary = "列表", description = "") - public R listNoUsed(AssayContentDetail authClient, Query query) { + public R listNoUsed(AssayContentDetail authClient, Query query) { return R.data(null); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java index 306d8b0..90f7123 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java @@ -1,7 +1,6 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -15,12 +14,18 @@ import org.springblade.core.secure.annotation.IsAdministrator; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.constant.MoldPlanConst; import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.entity.MoldPlanOrder; +import org.springblade.desk.order.entity.MoldPlanTool; +import org.springblade.desk.order.request.MoldPlanSave; import org.springblade.desk.order.service.IMoldPlanOrderService; import org.springblade.desk.order.service.IMoldPlanService; import org.springblade.desk.order.service.IMoldPlanToolService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 烧结模具计划 * @@ -43,7 +48,6 @@ public class MoldPlanController extends BladeController { * 分页 */ @GetMapping("/page") - @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "") public R> page(MoldPlan entity, Query query) { IPage page = moldPlanService.selectPage(Condition.getPage(query), entity); @@ -54,7 +58,6 @@ public class MoldPlanController extends BladeController { * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") public R detail(String id) { MoldPlan detail = moldPlanService.getById(id); @@ -65,12 +68,12 @@ public class MoldPlanController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") - public R save(@Valid @RequestBody MoldPlan entity) { - // 保存模具需求 - // 保存模具需求明细（工装信息、订单信息） - moldPlanService.save(entity); + public R save(@Valid @RequestBody MoldPlanSave saveData) { + MoldPlan entity = saveData.getMoldPlan(); + List orderList = saveData.getOrderList(); + List toolList = saveData.getToolList(); + moldPlanService.save(entity, orderList, toolList); return R.status(true); } @@ -78,10 +81,12 @@ public class MoldPlanController extends BladeController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") - public R update(@Valid @RequestBody MoldPlan entity) { - moldPlanService.updateById(entity); + public R update(@Valid @RequestBody MoldPlanSave saveData) { + MoldPlan entity = saveData.getMoldPlan(); + List orderList = saveData.getOrderList(); + List toolList = saveData.getToolList(); + moldPlanService.update(entity, orderList, toolList); return R.status(true); } @@ -89,31 +94,30 @@ public class MoldPlanController extends BladeController { * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 6) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(moldPlanService.deleteLogic(Func.toLongList(ids))); + Boolean result = moldPlanService.deleteLogic(Func.toLongList(ids)); + return R.status(result); + } /** * 批量关闭 */ @PostMapping("/closeBatch") - @ApiOperationSupport(order = 7) @Operation(summary = "批量关闭", description = "传入ids") public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(true); + Boolean result = moldPlanService.changeStatus(Func.toLongList(ids), MoldPlanConst.STATUS_CLOSE); + return R.status(result); } /** * 分页-近一月的模具计划 */ @GetMapping("/pageNearlyMonth") - @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "") public R> pageNearlyMonth(MoldPlan authClient, Query query) { // 根据零件号，分页查询近一月的模具申报 return R.data(null); } - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index 9b437cf..5e3ede4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -16,10 +16,14 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; +import org.springblade.desk.order.request.PlateGoodsApplySave; import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; import org.springblade.desk.order.service.IPlateGoodsApplyService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 镀层物料添加量申报 * @@ -65,10 +69,10 @@ public class PlateGoodsApplyController extends BladeController { @PostMapping("/save") @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") - public R save(@Valid @RequestBody PlateGoodsApply entity) { - // 保存添加申报 - // 保存添加申报明细 - plateGoodsApplyService.save(entity); + public R save(@Valid @RequestBody PlateGoodsApplySave saveData) { + PlateGoodsApply entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + plateGoodsApplyService.save(entity, detailList); return R.status(true); } @@ -78,8 +82,10 @@ public class PlateGoodsApplyController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") - public R update(@Valid @RequestBody PlateGoodsApply entity) { - plateGoodsApplyService.updateById(entity); + public R update(@Valid @RequestBody PlateGoodsApplySave saveData) { + PlateGoodsApply entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + plateGoodsApplyService.update(entity, detailList); return R.status(true); } @@ -97,9 +103,11 @@ public class PlateGoodsApplyController extends BladeController { * 批量审核 */ @PostMapping("/confirmBatch") - @ApiOperationSupport(order = 7) - @Operation(summary = "批量审核", description = "传入ids") - public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(true); + @Operation(summary = "批量审核", description = "") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus, + @Parameter(description = "审批意见", required = true) @RequestParam String approvalMemo) { + Boolean result = plateGoodsApplyService.confirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo); + return R.status(result); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java index a07c443..3295b70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -1,7 +1,6 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -15,12 +14,17 @@ import org.springblade.core.secure.annotation.IsAdministrator; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.constant.PlateGoodsConst; import org.springblade.desk.order.entity.AssayContentDetail; import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; +import org.springblade.desk.order.request.PlateGoodsRecordSave; import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; import org.springblade.desk.order.service.IPlateGoodsRecordService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 镀层物料需求申报 * @@ -35,28 +39,26 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "镀层物料需求申报", description = "接口") public class PlateGoodsRecordController extends BladeController { - private final IPlateGoodsRecordService assayContentDetailService; - private final IPlateGoodsRecordDetailService plateGoodsRecordDetailService; + private final IPlateGoodsRecordService goodsRecordService; + private final IPlateGoodsRecordDetailService goodsRecordDetailService; /** * 分页 */ @GetMapping("/page") - @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "") public R> page(PlateGoodsRecord entity, Query query) { - IPage page = assayContentDetailService.selectPage(Condition.getPage(query), entity); - return R.data(page); + IPage page = goodsRecordService.selectPage(Condition.getPage(query), entity); + return R.data(page); } /** * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") public R detail(String id) { - PlateGoodsRecord detail = assayContentDetailService.getById(id); + PlateGoodsRecord detail = goodsRecordService.getById(id); return R.data(detail); } @@ -64,12 +66,11 @@ public class PlateGoodsRecordController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") - public R save(@Valid @RequestBody PlateGoodsRecord entity) { - // 保存申报结果 - // 保存申报明细 - assayContentDetailService.save(entity); + public R save(@Valid @RequestBody PlateGoodsRecordSave saveData) { + PlateGoodsRecord entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + goodsRecordService.save(entity, detailList); return R.status(true); } @@ -77,10 +78,11 @@ public class PlateGoodsRecordController extends BladeController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") - public R update(@Valid @RequestBody PlateGoodsRecord entity) { - assayContentDetailService.updateById(entity); + public R update(@Valid @RequestBody PlateGoodsRecordSave saveData) { + PlateGoodsRecord entity = saveData.getAssayContent(); + List detailList = saveData.getDetailList(); + goodsRecordService.update(entity, detailList); return R.status(true); } @@ -88,37 +90,38 @@ public class PlateGoodsRecordController extends BladeController { * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 5) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(assayContentDetailService.deleteLogic(Func.toLongList(ids))); + Boolean result = goodsRecordService.deleteLogic(Func.toLongList(ids)); + return R.status(result); } /** * 批量审核 */ @PostMapping("/confirmBatch") - @ApiOperationSupport(order = 6) - @Operation(summary = "批量审核", description = "传入ids") - public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(true); + @Operation(summary = "批量审核", description = "") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus, + @Parameter(description = "审批意见", required = true) @RequestParam String approvalMemo) { + Boolean result = goodsRecordService.confirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo); + return R.status(result); } /** * 批量关闭 */ @PostMapping("/closeBatch") - @ApiOperationSupport(order = 7) @Operation(summary = "批量关闭", description = "传入ids") public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(true); + Boolean result = goodsRecordService.changeStatus(Func.toLongList(ids), PlateGoodsConst.STATUS_CLOSE); + return R.status(result); } /** * 列表 - 查询已审批通过但未添加完成的申请列表 */ @GetMapping("/listNoFinished") - @ApiOperationSupport(order = 1) @Operation(summary = "列表", description = "") public R listNoFinished(AssayContentDetail authClient, Query query) { return R.data(null); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 6204442..80a1d6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -1,10 +1,12 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -15,12 +17,14 @@ import org.springblade.core.secure.annotation.IsAdministrator; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.order.constant.YieldOrderConst; import org.springblade.desk.order.entity.YieldOrder; +import org.springblade.desk.order.entity.YieldOrderCraft; import org.springblade.desk.order.service.IYieldOrderCraftService; import org.springblade.desk.order.service.IYieldOrderService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 生产订单 * @@ -42,9 +46,12 @@ public class YieldOrderController extends BladeController { * 分页查询列表 */ @GetMapping("/page") - @ApiOperationSupport(order = 1) + @Parameters({ + @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) @Operation(summary = "分页", description = "") - public R> page(YieldOrder entity, Query query) { + public R> page(@Parameter(hidden = true) YieldOrder entity, Query query) { IPage page = yieldOrderService.selectPage(Condition.getPage(query), entity); return R.data(page); } @@ -53,9 +60,12 @@ public class YieldOrderController extends BladeController { * 分页查询列表 - 异常订单 */ @GetMapping("/pageException") - @ApiOperationSupport(order = 1) + @Parameters({ + @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) @Operation(summary = "分页", description = "") - public R> pageException(YieldOrder entity, Query query) { + public R> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) { IPage page = yieldOrderService.selectPage(Condition.getPage(query), entity); return R.data(page); } @@ -64,9 +74,8 @@ public class YieldOrderController extends BladeController { * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") - public R detail(String id) { + public R detail(@Parameter(description = "主键", required = true) @RequestParam String id) { YieldOrder detail = yieldOrderService.getById(id); return R.data(detail); } @@ -75,66 +84,75 @@ public class YieldOrderController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") public R save(@Valid @RequestBody YieldOrder entity) { - yieldOrderService.save(entity); - return R.status(true); + Boolean result = yieldOrderService.save(entity); + return R.status(result); } /** * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") public R update(@Valid @RequestBody YieldOrder entity) { - yieldOrderService.updateById(entity); - return R.status(true); + Boolean result = yieldOrderService.updateById(entity); + return R.status(result); } - /** * 批量确认 */ @PostMapping("/confirmBatch") - @ApiOperationSupport(order = 5) - @Operation(summary = "批量确认", description = "传入ids") - public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - Boolean result = yieldOrderService.changeStatus(Func.toLongList(ids), YieldOrderConst.STATUS_CLOSED); + @Operation(summary = "批量确认", description = "传入ids") + public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + Boolean result = yieldOrderService.confirmBatch(Func.toLongList(ids)); return R.status(result); - } + } - /** - * 工艺路线 - */ - @PostMapping("/getCraftList") - @ApiOperationSupport(order = 6) - @Operation(summary = "批量确认", description = "传入id") - public R getCraftList(@Parameter(description = "主键", required = true) @RequestParam String id) { - // 根据生产订单ID查询工艺列表 - return R.data(null); - } + /** + * 工艺路线 + */ + @PostMapping("/getCraftList") + @Operation(summary = "工艺路线", description = "传入id") + public R getCraftList(@Parameter(description = "生产订单ID", required = true) @RequestParam Long id) { + List craftList = yieldOrderCraftService.listByYoId(id); + return R.data(craftList); + } - /** - * 批量修改优先级 - */ - @PostMapping("/updatePreference") - @ApiOperationSupport(order = 7) - @Operation(summary = "修改优先级", description = "传入id") - public R updatePreferenceBatch(@Parameter(description = "主键", required = true) @RequestParam String id, @RequestParam String preference) { - // 根据生产订单ID修改排产优先级 - return R.status(yieldOrderService.deleteLogic(Func.toLongList(id))); - } + /** + * 批量修改优先级 + */ + @PostMapping("/updatePreference") + @Operation(summary = "修改优先级", description = "传入id") + public R updatePreferenceBatch(@Parameter(description = "生产订单ID集合", required = true) @RequestParam String ids, + @Parameter(description = "修改后的优先级", required = true) @RequestParam Integer priority) { + Boolean result = yieldOrderService.updatePreferenceBatch(Func.toLongList(ids), priority); + return R.status(result); + } - /** - * 分页-查询订单配套信息 - */ - @PostMapping("/pageAllocation") - @ApiOperationSupport(order = 8) - @Operation(summary = "分页查询订单配套信息", description = "") - public R pageAllocation() { - // 从ERP查询生产订单的配套信息 - return R.data(null); - } + /** + * 分页-查询订单配套信息 + */ + @PostMapping("/pageAllocation") + @Operation(summary = "分页查询订单配套信息", description = "") + public R pageAllocation() { + //TODO 从ERP查询生产订单的配套信息 + return R.data(null); + } + + /** + * 验证编码是否重复 + * + * @param yieldOrderId + * @param yieldOrderCode + * @return true:重复 false:不重复 + */ + @PostMapping(value = "/checkCode") + @Operation(summary = "验证编码是否重复", description = "") + public R checkCode(@Parameter(description = "生产订单ID", required = true) @RequestParam String yieldOrderId, + @Parameter(description = "生产计划编码", required = true) @RequestBody String yieldOrderCode) { + Boolean result = yieldOrderService.checkCode(yieldOrderId, yieldOrderCode); + return R.data(result); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java index 2beadc9..8cb6bec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java @@ -1,10 +1,13 @@ package org.springblade.desk.order.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -20,6 +23,8 @@ import org.springblade.desk.order.entity.YieldPlan; import org.springblade.desk.order.service.IYieldPlanService; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 应用管理控制器 - 生产计划 * @@ -40,9 +45,12 @@ public class YieldPlanController extends BladeController { * 分页查询列表 */ @GetMapping("/page") - @ApiOperationSupport(order = 1) + @Parameters({ + @Parameter(name = "ypCode", description = "计划单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) @Operation(summary = "分页", description = "") - public R> page(YieldPlan entity, Query query) { + public R> page(@Parameter(hidden = true) YieldPlan entity, Query query) { IPage page = yieldPlanService.selectPage(Condition.getPage(query), entity); return R.data(page); } @@ -51,9 +59,8 @@ public class YieldPlanController extends BladeController { * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") - public R detail(String id) { + public R detail(@Parameter(description = "主键", required = true) @RequestParam String id) { YieldPlan detail = yieldPlanService.getById(id); return R.data(detail); } @@ -62,7 +69,6 @@ public class YieldPlanController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") public R save(@Valid @RequestBody YieldPlan entity) { Boolean result = yieldPlanService.save(entity); @@ -73,7 +79,6 @@ public class YieldPlanController extends BladeController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") public R update(@Valid @RequestBody YieldPlan entity) { Boolean result = yieldPlanService.updateById(entity); @@ -87,10 +92,10 @@ public class YieldPlanController extends BladeController { * @return */ @GetMapping(value = "/getCraftData/{yieldPlanId}") - @ApiOperationSupport(order = 5) - @Operation(summary = "根据生产计划获取二级工艺", description = "") - public R getCraftData(@PathVariable Long yieldPlanId) { - return R.data(null); + @Operation(summary = "根据生产计划获取二级工艺", description = "传入id") + public R getCraftData(@Parameter(description = "主键", required = true) @PathVariable Long yieldPlanId) { + JSONObject resultObj = yieldPlanService.getCraftData(yieldPlanId); + return R.data(resultObj); } /** @@ -100,17 +105,16 @@ public class YieldPlanController extends BladeController { * @return */ @GetMapping(value = "/getFirstProcess/{partCode}") - @ApiOperationSupport(order = 6) - @Operation(summary = "通过零件号查询一级工序", description = "") - public R getFirstProcess(@PathVariable String partCode) { - return R.data(null); + @Operation(summary = "通过零件号查询一级工序", description = "传入零件号") + public R getFirstProcess(@Parameter(description = "零件号", required = true) @PathVariable String partCode) { + List resultList = yieldPlanService.getFirstProcess(partCode); + return R.data(resultList); } /** * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 7) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { Boolean result = yieldPlanService.deleteLogic(Func.toLongList(ids)); @@ -121,7 +125,6 @@ public class YieldPlanController extends BladeController { * 批量关闭 */ @PostMapping("/closeBatch") - @ApiOperationSupport(order = 8) @Operation(summary = "批量关闭", description = "传入ids") public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { Boolean result = yieldPlanService.changeStatus(Func.toLongList(ids), YieldPlanConst.STATUS_CLOSED); @@ -133,10 +136,24 @@ public class YieldPlanController extends BladeController { * 根据生产计划ID， 生产玻璃饼生产订单 */ @PostMapping("/saveGlassCake/{yieldPlanId}") - @ApiOperationSupport(order = 9) @Operation(summary = "下发玻璃饼订单", description = "传入id") public R saveGlassCake(@PathVariable String yieldPlanId) { Boolean result = yieldPlanService.saveGlassCake(yieldPlanId); return R.status(result); } + + /** + * 验证编码是否重复 + * + * @param yieldPlanId + * @param yieldPlanCode + * @return true:重复 false:不重复 + */ + @PostMapping(value = "/checkCode") + @Operation(summary = "验证编码是否重复", description = "") + public R checkCode(@Parameter(description = "生产计划ID", required = true) @RequestParam String yieldPlanId, + @Parameter(description = "生产计划编码", required = true) @RequestBody String yieldPlanCode) { + Boolean result = yieldPlanService.checkCode(yieldPlanId, yieldPlanCode); + return R.data(result); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java index 2716dfa..5a62f53 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.AssayContentDetail; +import java.util.List; + /** * @author lqk * @description 针对表【MES_ASSAY_CONTENT_DETAIL(化验含量明细)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.AssayContentDetail; */ public interface AssayContentDetailMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, AssayContentDetail entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml index 68d5464..afc06e7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java index 59debd5..ac53b71 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.AssayContent; +import java.util.List; + /** * @author lqk * @description 针对表【MES_ASSAY_CONTENT(化验含量)】的数据库操作Mapper @@ -11,5 +14,13 @@ import org.springblade.desk.order.entity.AssayContent; */ public interface AssayContentMapper extends BaseMapper { + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, AssayContent entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml index df37033..3860130 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java index 3f7692a..63cd676 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.MoldPlan; +import java.util.List; + /** * @author lqk * @description 针对表【MES_MOLD_PLAN(烧结模具计划)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.MoldPlan; */ public interface MoldPlanMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, MoldPlan entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml index ddbebae..8ce2498 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java index 478706f..56d3f7c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.MoldPlanOrder; +import java.util.List; + /** * @author lqk * @description 针对表【MES_MOLD_PLAN_ORDER(烧结模具计划-订单关联表)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.MoldPlanOrder; */ public interface MoldPlanOrderMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, MoldPlanOrder entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml index 8bd314c..45ca211 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java index 7c0abd3..ffa4e07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.MoldPlanTool; +import java.util.List; + /** * @author lqk * @description 针对表【MES_MOLD_PLAN_TOOL(烧结模具计划-工装关联表)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.MoldPlanTool; */ public interface MoldPlanToolMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, MoldPlanTool entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml index 3d3c151..c19c22f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java index dfdcd70..1c1475d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.PlateGoodsApplyDetail; +import java.util.List; + /** * @author lqk * @description 针对表【MES_PLATE_GOODS_APPLY_DETAIL(镀层物料添加量申报明细)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.PlateGoodsApplyDetail; */ public interface PlateGoodsApplyDetailMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, PlateGoodsApplyDetail entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml index a27bfe0..84a4c33 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java index baaec82..4c48dce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.PlateGoodsApply; +import java.util.List; + /** * @author lqk * @description 针对表【MES_PLATE_GOODS_APPLY(镀层物料申报添加量)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.PlateGoodsApply; */ public interface PlateGoodsApplyMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, PlateGoodsApply entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml index acad3a3..fae254e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java index 32e465f..ca16994 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.PlateGoodsRecordDetail; +import java.util.List; + /** * @author lqk * @description 针对表【MES_PLATE_GOODS_RECORD_DETAIL(镀层物料需求申报明细)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.PlateGoodsRecordDetail; */ public interface PlateGoodsRecordDetailMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, PlateGoodsRecordDetail entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml index 0b732c3..31bdcf9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java index 2a046ee..98216a8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.PlateGoodsRecord; +import java.util.List; + /** * @author lqk * @description 针对表【MES_PLATE_GOODS_RECORD(镀层物料额外需求上报)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.PlateGoodsRecord; */ public interface PlateGoodsRecordMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, PlateGoodsRecord entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml index 816d8ee..b756bd5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java index cd7e9f3..538e898 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.YieldOrderCraft; +import java.util.List; + /** * @author lqk * @description 针对表【MES_YIELD_ORDER_CRAFT(生产订单工艺)】的数据库操作Mapper @@ -11,5 +14,12 @@ import org.springblade.desk.order.entity.YieldOrderCraft; */ public interface YieldOrderCraftMapper extends BaseMapper { - + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, YieldOrderCraft entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml index 5828219..4fdc398 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml @@ -3,5 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java index f678de6..ffb58b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java @@ -1,8 +1,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.order.entity.YieldOrder; +import java.util.List; + /** * @author lqk * @description 针对表【MES_YIELD_ORDER(生产订单)】的数据库操作Mapper @@ -11,4 +14,12 @@ import org.springblade.desk.order.entity.YieldOrder; */ public interface YieldOrderMapper extends BaseMapper { + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, YieldOrder entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index b378df2..aa4e660 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -2,6 +2,9 @@ - + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java index 140cc3d..c9df707 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.AssayContent; +import org.springblade.desk.order.entity.AssayContentDetail; + +import java.util.List; /** * 服务实现类 @@ -18,4 +21,22 @@ public interface IAssayContentService extends BaseService { * @return */ IPage selectPage(IPage page, AssayContent entity); + + /** + * 保存 + * + * @param entity + * @param detailList + * @return + */ + boolean save(AssayContent entity, List detailList); + + /** + * 修改 + * + * @param entity + * @param detailList + * @return + */ + boolean update(AssayContent entity, List detailList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java index 8ec7602..23dda4b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java @@ -3,6 +3,10 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.entity.MoldPlanOrder; +import org.springblade.desk.order.entity.MoldPlanTool; + +import java.util.List; /** * 服务实现类 @@ -18,4 +22,24 @@ public interface IMoldPlanService extends BaseService { * @return */ IPage selectPage(IPage page, MoldPlan entity); + + /** + * 保存 + * + * @param entity + * @param orderList + * @param toolList + * @return + */ + boolean save(MoldPlan entity, List orderList, List toolList); + + /** + * 修改 + * + * @param entity + * @param orderList + * @param toolList + * @return + */ + boolean update(MoldPlan entity, List orderList, List toolList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java index 066cde6..9ac6797 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; + +import java.util.List; /** * 服务实现类 @@ -18,4 +21,32 @@ public interface IPlateGoodsApplyService extends BaseService { * @return */ IPage selectPage(IPage page, PlateGoodsApply entity); + + /** + * 保存 + * + * @param entity + * @param detailList + * @return + */ + boolean save(PlateGoodsApply entity, List detailList); + + /** + * 修改 + * + * @param entity + * @param detailList + * @return + */ + boolean update(PlateGoodsApply entity, List detailList); + + /** + * 批量审核 + * + * @param ids + * @param approvalStatus + * @param approvalMemo + * @return + */ + boolean confirmBatch(List ids, Integer approvalStatus, String approvalMemo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java index ccc1eab..e101b47 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; + +import java.util.List; /** * 服务实现类 @@ -18,4 +21,32 @@ public interface IPlateGoodsRecordService extends BaseService * @return */ IPage selectPage(IPage page, PlateGoodsRecord entity); + + /** + * 保存 + * + * @param entity + * @param detailList + * @return + */ + boolean save(PlateGoodsRecord entity, List detailList); + + /** + * 修改 + * + * @param entity + * @param detailList + * @return + */ + boolean update(PlateGoodsRecord entity, List detailList); + + /** + * 批量审核 + * + * @param ids + * @param approvalStatus + * @param approvalMemo + * @return + */ + boolean confirmBatch(List ids, Integer approvalStatus, String approvalMemo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java index 65bd554..5f2ff8d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.YieldOrderCraft; +import java.util.List; + /** * 服务实现类 * @@ -20,6 +22,14 @@ public interface IYieldOrderCraftService extends BaseService { */ IPage selectPage(IPage page, YieldOrderCraft entity); + /** + * 根据生产订单ID查询工艺列表 + * + * @param yoId + * @return + */ + List listByYoId(Long yoId); + /** * 同步旧MES的待排产订单工艺数据 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index 451c3b7..2b54727 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -1,9 +1,12 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.constraints.NotEmpty; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.entity.YieldOrder; +import java.util.List; + /** * 服务实现类 * @@ -21,7 +24,60 @@ public interface IYieldOrderService extends BaseService { IPage selectPage(IPage page, YieldOrder entity); /** - * 同步旧MES的待排产订单数据 + * 批量确认 + * + * @param ids + * @return + */ + boolean confirmBatch(@NotEmpty List ids); + + /** + * 批量修改优先级 + * + * @param ids + * @param priority + * @return + */ + boolean updatePreferenceBatch(@NotEmpty List ids, Integer priority); + + /** + * 检查订单号是否已存在 + * + * @param yieldOrderId + * @param yieldOrderCode + * @return + */ + Boolean checkCode(String yieldOrderId, String yieldOrderCode); + + /** + * 订单校验-数据 + * + * @param yieldOrderId + * @return + */ + Boolean verifyYieldOrderData(String yieldOrderId); + + /** + * 订单校验-工艺 + * + * @param yieldOrderId + * @return + */ + Boolean verifyYieldOrderCraft(String yieldOrderId); + + /** + * 订单校验-资源 + * + * @param yieldOrderId + * @return + */ + Boolean verifyYieldOrderResource(String yieldOrderId); + + /** + * 订单校验-交期 + * + * @param yieldOrderId + * @return */ - void syncYieldOrderData(); + Boolean verifyYieldOrderDelivery(String yieldOrderId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java index 8f2481d..22d78e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java @@ -26,10 +26,10 @@ public interface IYieldPlanService extends BaseService { /** * 根据生产计划ID获取二级工艺 * - * @param ypId + * @param yieldPlanId * @return */ - JSONObject getCraftData(Long ypId); + JSONObject getCraftData(Long yieldPlanId); /** * 通过零件号从ERP查询一级工序 @@ -46,4 +46,13 @@ public interface IYieldPlanService extends BaseService { * @return */ Boolean saveGlassCake(String yieldPlanId); + + /** + * 检查订单号是否已存在 + * + * @param yieldPlanId + * @param yieldPlanCode + * @return + */ + Boolean checkCode(String yieldPlanId, String yieldPlanCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java index 0361b14..0fd29d5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java @@ -7,6 +7,8 @@ import org.springblade.desk.order.mapper.AssayContentDetailMapper; import org.springblade.desk.order.service.IAssayContentDetailService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,6 +19,7 @@ public class AssayContentDetailServiceImpl extends BaseServiceImpl selectPage(IPage page, AssayContentDetail entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java index 4cf93bc..5796def 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java @@ -1,22 +1,54 @@ package org.springblade.desk.order.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.order.entity.AssayContent; +import org.springblade.desk.order.entity.AssayContentDetail; import org.springblade.desk.order.mapper.AssayContentMapper; +import org.springblade.desk.order.service.IAssayContentDetailService; import org.springblade.desk.order.service.IAssayContentService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * * @author BladeX */ +@RequiredArgsConstructor @Service public class AssayContentServiceImpl extends BaseServiceImpl implements IAssayContentService { + private final IAssayContentDetailService detailService; + @Override public IPage selectPage(IPage page, AssayContent entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean save(AssayContent entity, List detailList) { + if (this.save(entity)) { + for (AssayContentDetail detail : detailList) { + detail.setAcId(entity.getId()); + } + detailService.saveBatch(detailList); + return true; + } + return false; } + + @Override + public boolean update(AssayContent entity, List detailList) { + if (this.updateById(entity)) { + detailService.saveBatch(detailList); + return true; + } + return false; + } + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java index 7ab465f..9d18081 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java @@ -7,6 +7,8 @@ import org.springblade.desk.order.mapper.MoldPlanOrderMapper; import org.springblade.desk.order.service.IMoldPlanOrderService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,6 +19,7 @@ public class MoldPlanOrderServiceImpl extends BaseServiceImpl selectPage(IPage page, MoldPlanOrder entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java index 731b812..01f9fe0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java @@ -1,22 +1,65 @@ package org.springblade.desk.order.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.order.entity.MoldPlan; +import org.springblade.desk.order.entity.MoldPlanOrder; +import org.springblade.desk.order.entity.MoldPlanTool; import org.springblade.desk.order.mapper.MoldPlanMapper; +import org.springblade.desk.order.service.IMoldPlanOrderService; import org.springblade.desk.order.service.IMoldPlanService; +import org.springblade.desk.order.service.IMoldPlanToolService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 服务实现类 * * @author BladeX */ +@RequiredArgsConstructor @Service public class MoldPlanServiceImpl extends BaseServiceImpl implements IMoldPlanService { + private final IMoldPlanOrderService orderService; + + private final IMoldPlanToolService toolService; + @Override public IPage selectPage(IPage page, MoldPlan entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean save(MoldPlan entity, List orderList, List toolList) { + if (this.save(entity)) { + for (MoldPlanOrder moldPlanOrder : orderList) { + moldPlanOrder.setMpId(entity.getId()); + } + orderService.saveBatch(orderList); + + for (MoldPlanTool moldPlanTool : toolList) { + moldPlanTool.setMpId(entity.getId()); + } + toolService.saveBatch(toolList); + return true; + } + return false; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean update(MoldPlan entity, List orderList, List toolList) { + if (this.save(entity)) { + orderService.saveBatch(orderList); + toolService.saveBatch(toolList); + return true; + } + return false; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java index 2522c34..51bb1ab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java @@ -7,6 +7,8 @@ import org.springblade.desk.order.mapper.MoldPlanToolMapper; import org.springblade.desk.order.service.IMoldPlanToolService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,6 +19,7 @@ public class MoldPlanToolServiceImpl extends BaseServiceImpl selectPage(IPage page, MoldPlanTool entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java index 170e055..3825395 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java @@ -7,6 +7,8 @@ import org.springblade.desk.order.mapper.PlateGoodsApplyDetailMapper; import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,6 +19,7 @@ public class PlateGoodsApplyDetailServiceImpl extends BaseServiceImpl selectPage(IPage page, PlateGoodsApplyDetail entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index b10ed51..b606cbd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -1,22 +1,77 @@ package org.springblade.desk.order.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.order.entity.PlateGoodsApply; +import org.springblade.desk.order.entity.PlateGoodsApplyDetail; import org.springblade.desk.order.mapper.PlateGoodsApplyMapper; +import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; import org.springblade.desk.order.service.IPlateGoodsApplyService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 服务实现类 * * @author BladeX */ +@RequiredArgsConstructor @Service public class PlateGoodsApplyServiceImpl extends BaseServiceImpl implements IPlateGoodsApplyService { + private final IPlateGoodsApplyDetailService detailService; + @Override public IPage selectPage(IPage page, PlateGoodsApply entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean save(PlateGoodsApply entity, List detailList) { + if (this.save(entity)) { + for (PlateGoodsApplyDetail detail : detailList) { + detail.setPgadId(entity.getId()); + } + detailService.saveBatch(detailList); + return true; + } + return false; + } + + @Override + public boolean update(PlateGoodsApply entity, List detailList) { + if (this.save(entity)) { + //TODO 先根据需求ID将原明细删除 + + // 保存新的明细 + detailService.saveBatch(detailList); + return true; + } + return false; + } + + @Override + public boolean confirmBatch(List ids, Integer approvalStatus, String approvalMemo) { + List dataList = new ArrayList<>(); + + BladeUser user = AuthUtil.getUser(); + ids.forEach(id -> { + PlateGoodsApply item = new PlateGoodsApply(); + item.setId(id); + item.setApprovalMan(user.getUserId()); + item.setApprovalTime(DateUtil.now()); + item.setApprovalStatus(approvalStatus); + item.setApprovalMemo(approvalMemo); + dataList.add(item); + }); + + return this.updateBatchById(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java index deb58eb..04b1bc8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java @@ -7,6 +7,8 @@ import org.springblade.desk.order.mapper.PlateGoodsRecordDetailMapper; import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,6 +19,7 @@ public class PlateGoodsRecordDetailServiceImpl extends BaseServiceImpl selectPage(IPage page, PlateGoodsRecordDetail entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 3ed3435..77c06a0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -1,22 +1,77 @@ package org.springblade.desk.order.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.order.entity.PlateGoodsRecord; +import org.springblade.desk.order.entity.PlateGoodsRecordDetail; import org.springblade.desk.order.mapper.PlateGoodsRecordMapper; +import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; import org.springblade.desk.order.service.IPlateGoodsRecordService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 服务实现类 * * @author BladeX */ +@RequiredArgsConstructor @Service public class PlateGoodsRecordServiceImpl extends BaseServiceImpl implements IPlateGoodsRecordService { + private final IPlateGoodsRecordDetailService detailService; + @Override public IPage selectPage(IPage page, PlateGoodsRecord entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean save(PlateGoodsRecord entity, List detailList) { + if (this.save(entity)) { + for (PlateGoodsRecordDetail detail : detailList) { + detail.setPgrdId(entity.getId()); + } + detailService.saveBatch(detailList); + return true; + } + return false; + } + + @Override + public boolean update(PlateGoodsRecord entity, List detailList) { + if (this.save(entity)) { + //TODO 先根据需求ID将原明细删除 + + // 保存新的明细 + detailService.saveBatch(detailList); + return true; + } + return false; + } + + @Override + public boolean confirmBatch(List ids, Integer approvalStatus, String approvalMemo) { + List plateGoodsRecordList = new ArrayList<>(); + + BladeUser user = AuthUtil.getUser(); + ids.forEach(id -> { + PlateGoodsRecord plateGoodsRecord = new PlateGoodsRecord(); + plateGoodsRecord.setId(id); + plateGoodsRecord.setApprovalMan(user.getUserId()); + plateGoodsRecord.setApprovalTime(DateUtil.now()); + plateGoodsRecord.setApprovalStatus(approvalStatus); + plateGoodsRecord.setApprovalMemo(approvalMemo); + plateGoodsRecordList.add(plateGoodsRecord); + }); + + return this.updateBatchById(plateGoodsRecordList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java index 0352de0..a8a3b18 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java @@ -1,12 +1,17 @@ package org.springblade.desk.order.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.order.entity.YieldOrderCraft; import org.springblade.desk.order.mapper.YieldOrderCraftMapper; import org.springblade.desk.order.service.IYieldOrderCraftService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -17,7 +22,17 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl selectPage(IPage page, YieldOrderCraft entity) { - return null; + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public List listByYoId(Long yoId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(YieldOrderCraft.class) + .eq(YieldOrderCraft::getYoId, yoId) + .eq(YieldOrderCraft::getIsDeleted, CommonConstant.DELETE_FALSE); + List craftList = baseMapper.selectList(queryWrapper); + return craftList; } @Override diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index a034ece..5562910 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -1,12 +1,19 @@ package org.springblade.desk.order.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.desk.order.constant.YieldOrderConst; import org.springblade.desk.order.entity.YieldOrder; import org.springblade.desk.order.mapper.YieldOrderMapper; import org.springblade.desk.order.service.IYieldOrderService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 服务实现类 * @@ -17,11 +24,66 @@ public class YieldOrderServiceImpl extends BaseServiceImpl selectPage(IPage page, YieldOrder entity) { + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean confirmBatch(List ids) { + List yieldOrderList = new ArrayList<>(); + + ids.forEach(id -> { + YieldOrder yieldOrder = new YieldOrder(); + yieldOrder.setId(id); + yieldOrder.setReceiveStatus(YieldOrderConst.RECEIVE_STATUS_YES); + yieldOrderList.add(yieldOrder); + }); + + return this.updateBatchById(yieldOrderList); + } + + @Override + public boolean updatePreferenceBatch(List ids, Integer priority) { + List yieldOrderList = new ArrayList<>(); + + ids.forEach(id -> { + YieldOrder yieldOrder = new YieldOrder(); + yieldOrder.setId(id); + yieldOrder.setPriorityAps(priority); + yieldOrderList.add(yieldOrder); + }); + + return this.updateBatchById(yieldOrderList); + } + + @Override + public Boolean checkCode(String yieldOrderId, String yieldOrderCode) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(YieldOrder.class) + .ne(YieldOrder::getId, yieldOrderId) + .eq(YieldOrder::getYoCode, yieldOrderCode); + YieldOrder yieldPlan = baseMapper.selectOne(queryWrapper); + return ObjectUtil.isNotEmpty(yieldPlan); + } + + @Override + public Boolean verifyYieldOrderData(String yieldOrderId) { return null; } @Override - public void syncYieldOrderData() { + public Boolean verifyYieldOrderCraft(String yieldOrderId) { + return null; + } + @Override + public Boolean verifyYieldOrderResource(String yieldOrderId) { + return null; } + + @Override + public Boolean verifyYieldOrderDelivery(String yieldOrderId) { + return null; + } + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java index 61b8409..998e776 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java @@ -1,15 +1,20 @@ package org.springblade.desk.order.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.desk.order.entity.YieldPlan; import org.springblade.desk.order.mapper.YieldPlanMapper; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.order.service.IYieldPlanService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -25,23 +30,64 @@ public class YieldPlanServiceImpl extends BaseServiceImpl selectPage(IPage page, YieldPlan entity) { - return page.setRecords(baseMapper.selectPage(page, entity)); + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); } @Override - public JSONObject getCraftData(Long ypId) { - return null; + public JSONObject getCraftData(Long yieldPlanId) { + JSONObject resultJson = new JSONObject(); + YieldPlan yieldPlan = baseMapper.selectById(yieldPlanId); + resultJson.put("primaryCraft", yieldPlan.getPrimaryCraft()); + + if (StringUtils.isBlank(yieldPlan.getRoamNo())) { + //TODO 获取第一个热表分厂处理的工艺 +// PjPlanRoam planRoam = pjPlanRoamService.getFirstWorkNo(yieldPlan.getPartCode()); +// +// if (planRoam == null) { +// return resultJson; +// } +// yieldPlan.setRoamNo(planRoam.getRoamNo()); + } + return resultJson; } @Override public List getFirstProcess(String partCode) { - return null; + List resultList = new ArrayList<>(); + //TODO 根据物料号， 调用ERP方法查询一级工序 + // select * from dba_mgr.v_partoplink_firseq@erp_mes_link a where prtno=:partCode + return resultList; } @Override public Boolean saveGlassCake(String yieldPlanId) { // 根据ID查询生产计划信息 - // 调用生产订单服务类中方法，生成玻璃饼订单并保存 + YieldPlan yieldPlan = baseMapper.selectById(yieldPlanId); + //TODO 调用生产订单服务类中方法，生成玻璃饼订单并保存 +// List blbSubList = dsPartSubService.listByPartCode(yieldPlan.getPartCode(), DsPartSub.SIN_TER_TYPE_BLB); +// if (blbSubList != null && blbSubList.size() > 0) { +// List blbList = null; +// for (DsPartSub dps : blbSubList) { +// //不包含玻璃字样的代表维护错误，跳过 +// if (StringUtils.isBlank(dps.getSubCode()) || StringUtils.isBlank(dps.getSubName()) || !dps.getSubName().contains("玻璃")) { +// continue; +// } +// blbList = pjYieldOrderService.findByPartCodeAndMemo(dps.getSubCode(), yieldPlan.getYpCode()); +// if (blbList == null || blbList.size() == 0) { +// pjYieldOrderService.saveBlbOrder(po, dps); +// } +// } +// } return true; } + + @Override + public Boolean checkCode(String yieldPlanId, String yieldPlanCode) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(YieldPlan.class) + .ne(YieldPlan::getId, yieldPlanId) + .eq(YieldPlan::getYpCode, yieldPlanCode); + YieldPlan yieldPlan = baseMapper.selectOne(queryWrapper); + return ObjectUtil.isNotEmpty(yieldPlan); + } }