订单相关提交

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

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

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

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;
 
 	/**
 	 * 审批结果

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

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

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

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<MoldPlanOrder> orderList;
+
+	/**
+	 * 关联工装明细
+	 */
+	private List<MoldPlanTool> toolList;
+}

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

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

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

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

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
 }

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,17 +37,16 @@ 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<IPage<AssayContentDetail>> page(AssayContentDetail entity, Query query) {
+    public R<IPage<AssayContent>> page(AssayContent entity, Query query) {
-		IPage<AssayContentDetail> page = assayContentDetailService.selectPage(Condition.getPage(query), entity);
+        IPage<AssayContent> page = assayContentService.selectPage(Condition.getPage(query), entity);
         return R.data(page);
     }
 
@@ -52,10 +54,9 @@ public class AssayContentController extends BladeController {
      * 详情
      */
     @GetMapping("/detail")
-    @ApiOperationSupport(order = 2)
     @Operation(summary = "详情", description = "")
-    public R<AssayContentDetail> detail(String id) {
+    public R<AssayContent> detail(String id) {
-        AssayContentDetail detail = assayContentDetailService.getById(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) {
+    public R save(@Valid @RequestBody AssayContentSave saveData) {
-        assayContentDetailService.save(entity);
+        AssayContent entity = saveData.getAssayContent();
+        List<AssayContentDetail> 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) {
+    public R update(@Valid @RequestBody AssayContentSave saveData) {
-        assayContentDetailService.updateById(entity);
+        AssayContent entity = saveData.getAssayContent();
+        List<AssayContentDetail> 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<AssayContentDetail> listNoUsed(AssayContentDetail authClient, Query query) {
+    public R<AssayContent> listNoUsed(AssayContentDetail authClient, Query query) {
         return R.data(null);
     }
 

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<IPage<MoldPlan>> page(MoldPlan entity, Query query) {
 		IPage<MoldPlan> 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<MoldPlan> 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) {
+    public R save(@Valid @RequestBody MoldPlanSave saveData) {
-        // 保存模具需求
+        MoldPlan entity = saveData.getMoldPlan();
-        // 保存模具需求明细（工装信息、订单信息）
+        List<MoldPlanOrder> orderList = saveData.getOrderList();
-        moldPlanService.save(entity);
+        List<MoldPlanTool> 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) {
+    public R update(@Valid @RequestBody MoldPlanSave saveData) {
-        moldPlanService.updateById(entity);
+        MoldPlan entity = saveData.getMoldPlan();
+        List<MoldPlanOrder> orderList = saveData.getOrderList();
+        List<MoldPlanTool> 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<IPage<MoldPlan>> pageNearlyMonth(MoldPlan authClient, Query query) {
         // 根据零件号，分页查询近一月的模具申报
         return R.data(null);
     }
-
 }

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) {
+    public R save(@Valid @RequestBody PlateGoodsApplySave saveData) {
-        // 保存添加申报
+        PlateGoodsApply entity = saveData.getAssayContent();
-        // 保存添加申报明细
+        List<PlateGoodsApplyDetail> detailList = saveData.getDetailList();
-        plateGoodsApplyService.save(entity);
+        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) {
+    public R update(@Valid @RequestBody PlateGoodsApplySave saveData) {
-        plateGoodsApplyService.updateById(entity);
+        PlateGoodsApply entity = saveData.getAssayContent();
+        List<PlateGoodsApplyDetail> 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 = "")
-    @Operation(summary = "批量审核", description = "传入ids")
+    public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids,
-    public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+                          @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus,
-        return R.status(true);
+                          @Parameter(description = "审批意见", required = true) @RequestParam String approvalMemo) {
+        Boolean result = plateGoodsApplyService.confirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo);
+        return R.status(result);
     }
 }

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,17 +39,16 @@ import org.springframework.web.bind.annotation.*;
 @Tag(name = "镀层物料需求申报", description = "接口")
 public class PlateGoodsRecordController extends BladeController {
 
-    private final IPlateGoodsRecordService assayContentDetailService;
+    private final IPlateGoodsRecordService goodsRecordService;
-    private final IPlateGoodsRecordDetailService plateGoodsRecordDetailService;
+    private final IPlateGoodsRecordDetailService goodsRecordDetailService;
 
     /**
      * 分页
      */
     @GetMapping("/page")
-    @ApiOperationSupport(order = 1)
     @Operation(summary = "分页", description = "")
     public R<IPage<PlateGoodsRecord>> page(PlateGoodsRecord entity, Query query) {
-		IPage<PlateGoodsRecord> page = assayContentDetailService.selectPage(Condition.getPage(query), entity);
+        IPage<PlateGoodsRecord> page = goodsRecordService.selectPage(Condition.getPage(query), entity);
         return R.data(page);
     }
 
@@ -53,10 +56,9 @@ public class PlateGoodsRecordController extends BladeController {
      * 详情
      */
     @GetMapping("/detail")
-    @ApiOperationSupport(order = 2)
     @Operation(summary = "详情", description = "")
     public R<PlateGoodsRecord> 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) {
+    public R save(@Valid @RequestBody PlateGoodsRecordSave saveData) {
-        // 保存申报结果
+        PlateGoodsRecord entity = saveData.getAssayContent();
-        // 保存申报明细
+        List<PlateGoodsRecordDetail> detailList = saveData.getDetailList();
-        assayContentDetailService.save(entity);
+        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) {
+    public R update(@Valid @RequestBody PlateGoodsRecordSave saveData) {
-        assayContentDetailService.updateById(entity);
+        PlateGoodsRecord entity = saveData.getAssayContent();
+        List<PlateGoodsRecordDetail> 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 = "")
-    @Operation(summary = "批量审核", description = "传入ids")
+    public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids,
-    public R confirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+                          @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus,
-        return R.status(true);
+                          @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<AssayContentDetail> listNoFinished(AssayContentDetail authClient, Query query) {
         return R.data(null);

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<IPage<YieldOrder>> page(YieldOrder entity, Query query) {
+	public R<IPage<YieldOrder>> page(@Parameter(hidden = true) YieldOrder entity, Query query) {
 		IPage<YieldOrder> 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<IPage<YieldOrder>> pageException(YieldOrder entity, Query query) {
+	public R<IPage<YieldOrder>> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) {
 		IPage<YieldOrder> 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<YieldOrder> detail(String id) {
+	public R<YieldOrder> detail(@Parameter(description = "主键", required = true) @RequestParam String id) {
 		YieldOrder detail = yieldOrderService.getById(id);
 		return R.data(detail);
 	}
@@ -75,33 +84,29 @@ public class YieldOrderController extends BladeController {
 	 * 新增
 	 */
 	@PostMapping("/save")
-	@ApiOperationSupport(order = 3)
 	@Operation(summary = "新增", description = "")
 	public R save(@Valid @RequestBody YieldOrder entity) {
-		yieldOrderService.save(entity);
+		Boolean result = yieldOrderService.save(entity);
-		return R.status(true);
+		return R.status(result);
 	}
 
 	/**
 	 * 修改
 	 */
 	@PostMapping("/update")
-	@ApiOperationSupport(order = 4)
 	@Operation(summary = "修改", description = "")
 	public R update(@Valid @RequestBody YieldOrder entity) {
-		yieldOrderService.updateById(entity);
+		Boolean result = yieldOrderService.updateById(entity);
-		return R.status(true);
+		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);
+		Boolean result = yieldOrderService.confirmBatch(Func.toLongList(ids));
 		return R.status(result);
 	}
 
@@ -109,32 +114,45 @@ public class YieldOrderController extends BladeController {
 	 * 工艺路线
 	 */
 	@PostMapping("/getCraftList")
-    @ApiOperationSupport(order = 6)
+	@Operation(summary = "工艺路线", description = "传入id")
-    @Operation(summary = "批量确认", description = "传入id")
+	public R getCraftList(@Parameter(description = "生产订单ID", required = true) @RequestParam Long id) {
-    public R getCraftList(@Parameter(description = "主键", required = true) @RequestParam String id) {
+		List<YieldOrderCraft> craftList = yieldOrderCraftService.listByYoId(id);
-        // 根据生产订单ID查询工艺列表
+		return R.data(craftList);
-        return R.data(null);
 	}
 
 	/**
 	 * 批量修改优先级
 	 */
 	@PostMapping("/updatePreference")
-    @ApiOperationSupport(order = 7)
 	@Operation(summary = "修改优先级", description = "传入id")
-    public R updatePreferenceBatch(@Parameter(description = "主键", required = true) @RequestParam String id, @RequestParam String preference) {
+	public R updatePreferenceBatch(@Parameter(description = "生产订单ID集合", required = true) @RequestParam String ids,
-        // 根据生产订单ID修改排产优先级
+								   @Parameter(description = "修改后的优先级", required = true) @RequestParam Integer priority) {
-        return R.status(yieldOrderService.deleteLogic(Func.toLongList(id)));
+		Boolean result = yieldOrderService.updatePreferenceBatch(Func.toLongList(ids), priority);
+		return R.status(result);
 	}
 
 	/**
 	 * 分页-查询订单配套信息
 	 */
 	@PostMapping("/pageAllocation")
-    @ApiOperationSupport(order = 8)
 	@Operation(summary = "分页查询订单配套信息", description = "")
 	public R pageAllocation() {
-        // 从ERP查询生产订单的配套信息
+		//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);
+	}
 }

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<IPage<YieldPlan>> page(YieldPlan entity, Query query) {
+	public R<IPage<YieldPlan>> page(@Parameter(hidden = true) YieldPlan entity, Query query) {
 		IPage<YieldPlan> 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<YieldPlan> detail(String id) {
+	public R<YieldPlan> 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 = "传入id")
-	@Operation(summary = "根据生产计划获取二级工艺", description = "")
+	public R getCraftData(@Parameter(description = "主键", required = true) @PathVariable Long yieldPlanId) {
-	public R<String> getCraftData(@PathVariable Long yieldPlanId) {
+		JSONObject resultObj = yieldPlanService.getCraftData(yieldPlanId);
-		return R.data(null);
+		return R.data(resultObj);
 	}
 
 	/**
@@ -100,17 +105,16 @@ public class YieldPlanController extends BladeController {
 	 * @return
 	 */
 	@GetMapping(value = "/getFirstProcess/{partCode}")
-	@ApiOperationSupport(order = 6)
+	@Operation(summary = "通过零件号查询一级工序", description = "传入零件号")
-	@Operation(summary = "通过零件号查询一级工序", description = "")
+	public R getFirstProcess(@Parameter(description = "零件号", required = true) @PathVariable String partCode) {
-	public R<String> getFirstProcess(@PathVariable String partCode) {
+		List<JSONObject> resultList = yieldPlanService.getFirstProcess(partCode);
-		return R.data(null);
+		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);
+	}
 }

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<AssayContentDetail> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<AssayContentDetail> selectPage(IPage page, AssayContentDetail entity);
 }

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">
 <mapper namespace = "org.springblade.desk.order.mapper.AssayContentDetailMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.AssayContentDetail">
 
+    </select>
 </mapper>

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<AssayContent> {
 
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<AssayContent> selectPage(IPage page, AssayContent entity);
 
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.AssayContentMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.AssayContent">
 
+    </select>
 </mapper>

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<MoldPlan> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<MoldPlan> selectPage(IPage page, MoldPlan entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlan">
 
+    </select>
 </mapper>

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<MoldPlanOrder> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<MoldPlanOrder> selectPage(IPage page, MoldPlanOrder entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanOrderMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlanOrder">
 
+    </select>
 </mapper>

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<MoldPlanTool> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<MoldPlanTool> selectPage(IPage page, MoldPlanTool entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanToolMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlanTool">
 
+    </select>
 </mapper>

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<PlateGoodsApplyDetail> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<PlateGoodsApplyDetail> selectPage(IPage page, PlateGoodsApplyDetail entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsApplyDetailMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsApplyDetail">
 
+    </select>
 </mapper>

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<PlateGoodsApply> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<PlateGoodsApply> selectPage(IPage page, PlateGoodsApply entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsApplyMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsApply">
 
+    </select>
 </mapper>

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<PlateGoodsRecordDetail> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<PlateGoodsRecordDetail> selectPage(IPage page, PlateGoodsRecordDetail entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsRecordDetailMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsRecordDetail">
 
+    </select>
 </mapper>

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<PlateGoodsRecord> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<PlateGoodsRecord> selectPage(IPage page, PlateGoodsRecord entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsRecordMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsRecord">
 
+    </select>
 </mapper>

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<YieldOrderCraft> {
 
-
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<YieldOrderCraft> selectPage(IPage page, YieldOrderCraft entity);
 }

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">
 <mapper namespace="org.springblade.desk.order.mapper.YieldOrderCraftMapper">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.YieldOrderCraft">
 
+    </select>
 </mapper>

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<YieldOrder> {
 
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	List<YieldOrder> selectPage(IPage page, YieldOrder entity);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -4,4 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "org.springblade.desk.order.mapper.YieldOrderMapper">
 
+    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.YieldOrder">
+
+    </select>
 </mapper>

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<AssayContent> {
 	 * @return
 	 */
 	IPage<AssayContent> selectPage(IPage<AssayContent> page, AssayContent entity);
+
+	/**
+	 * 保存
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean save(AssayContent entity, List<AssayContentDetail> detailList);
+
+	/**
+	 * 修改
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean update(AssayContent entity, List<AssayContentDetail> detailList);
 }

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<MoldPlan> {
 	 * @return
 	 */
 	IPage<MoldPlan> selectPage(IPage<MoldPlan> page, MoldPlan entity);
+
+	/**
+	 * 保存
+	 *
+	 * @param entity
+	 * @param orderList
+	 * @param toolList
+	 * @return
+	 */
+	boolean save(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList);
+
+	/**
+	 * 修改
+	 *
+	 * @param entity
+	 * @param orderList
+	 * @param toolList
+	 * @return
+	 */
+	boolean update(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList);
 }

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<PlateGoodsApply> {
 	 * @return
 	 */
 	IPage<PlateGoodsApply> selectPage(IPage<PlateGoodsApply> page, PlateGoodsApply entity);
+
+	/**
+	 * 保存
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList);
+
+	/**
+	 * 修改
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean update(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList);
+
+	/**
+	 * 批量审核
+	 *
+	 * @param ids
+	 * @param approvalStatus
+	 * @param approvalMemo
+	 * @return
+	 */
+	boolean confirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo);
 }

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<PlateGoodsRecord>
 	 * @return
 	 */
 	IPage<PlateGoodsRecord> selectPage(IPage<PlateGoodsRecord> page, PlateGoodsRecord entity);
+
+	/**
+	 * 保存
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean save(PlateGoodsRecord entity, List<PlateGoodsRecordDetail> detailList);
+
+	/**
+	 * 修改
+	 *
+	 * @param entity
+	 * @param detailList
+	 * @return
+	 */
+	boolean update(PlateGoodsRecord entity, List<PlateGoodsRecordDetail> detailList);
+
+		/**
+		 * 批量审核
+		 *
+		 * @param ids
+		 * @param approvalStatus
+		 * @param approvalMemo
+		 * @return
+		 */
+		boolean confirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo);
 }

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<YieldOrderCraft> {
 	 */
 	IPage<YieldOrderCraft> selectPage(IPage<YieldOrderCraft> page, YieldOrderCraft entity);
 
+	/**
+	 * 根据生产订单ID查询工艺列表
+	 *
+	 * @param yoId
+	 * @return
+	 */
+	List<YieldOrderCraft> listByYoId(Long yoId);
+
 	/**
 	 * 同步旧MES的待排产订单工艺数据
 	 */

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<YieldOrder> {
 	IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrder entity);
 
 	/**
-	 * 同步旧MES的待排产订单数据
+	 * 批量确认
+	 *
+	 * @param ids
+	 * @return
+	 */
+	boolean confirmBatch(@NotEmpty List<Long> ids);
+
+	/**
+	 * 批量修改优先级
+	 *
+	 * @param ids
+	 * @param priority
+	 * @return
+	 */
+	boolean updatePreferenceBatch(@NotEmpty List<Long> 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);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java

@@ -26,10 +26,10 @@ public interface IYieldPlanService extends BaseService<YieldPlan> {
 	/**
 	 * 根据生产计划ID获取二级工艺
 	 *
-	 * @param ypId
+	 * @param yieldPlanId
 	 * @return
 	 */
-	JSONObject getCraftData(Long ypId);
+	JSONObject getCraftData(Long yieldPlanId);
 
 	/**
 	 * 通过零件号从ERP查询一级工序
@@ -46,4 +46,13 @@ public interface IYieldPlanService extends BaseService<YieldPlan> {
 	 * @return
 	 */
 	Boolean saveGlassCake(String yieldPlanId);
+
+	/**
+	 * 检查订单号是否已存在
+	 *
+	 * @param yieldPlanId
+	 * @param yieldPlanCode
+	 * @return
+	 */
+	Boolean checkCode(String yieldPlanId, String yieldPlanCode);
 }

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<AssayContentD
 
 	@Override
 	public IPage<AssayContentDetail> selectPage(IPage<AssayContentDetail> page, AssayContentDetail entity) {
-		return null;
+		List<AssayContentDetail> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 }

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<AssayContentMapper, AssayContent> implements IAssayContentService {
 
+	private final IAssayContentDetailService detailService;
+
 	@Override
 	public IPage<AssayContent> selectPage(IPage<AssayContent> page, AssayContent entity) {
-		return null;
+		List<AssayContent> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Override
+	public boolean save(AssayContent entity, List<AssayContentDetail> 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<AssayContentDetail> detailList) {
+		if (this.updateById(entity)) {
+			detailService.saveBatch(detailList);
+			return true;
+		}
+		return false;
+	}
+
+
 }

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<MoldPlanOrderMappe
 
 	@Override
 	public IPage<MoldPlanOrder> selectPage(IPage<MoldPlanOrder> page, MoldPlanOrder entity) {
-		return null;
+		List<MoldPlanOrder> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 }

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<MoldPlanMapper, MoldPlan> implements IMoldPlanService {
 
+	private final IMoldPlanOrderService orderService;
+
+	private final IMoldPlanToolService toolService;
+
 	@Override
 	public IPage<MoldPlan> selectPage(IPage<MoldPlan> page, MoldPlan entity) {
-		return null;
+		List<MoldPlan> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public boolean save(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> 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<MoldPlanOrder> orderList, List<MoldPlanTool> toolList) {
+		if (this.save(entity)) {
+			orderService.saveBatch(orderList);
+			toolService.saveBatch(toolList);
+			return true;
+		}
+		return false;
 	}
 }

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<MoldPlanToolMapper,
 
 	@Override
 	public IPage<MoldPlanTool> selectPage(IPage<MoldPlanTool> page, MoldPlanTool entity) {
-		return null;
+		List<MoldPlanTool> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 }

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<PlateGoods
 
 	@Override
 	public IPage<PlateGoodsApplyDetail> selectPage(IPage<PlateGoodsApplyDetail> page, PlateGoodsApplyDetail entity) {
-		return null;
+		List<PlateGoodsApplyDetail> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 }

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<PlateGoodsApplyMapper, PlateGoodsApply> implements IPlateGoodsApplyService {
 
+	private final IPlateGoodsApplyDetailService detailService;
+
 	@Override
 	public IPage<PlateGoodsApply> selectPage(IPage<PlateGoodsApply> page, PlateGoodsApply entity) {
-		return null;
+		List<PlateGoodsApply> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Override
+	public boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> 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<PlateGoodsApplyDetail> detailList) {
+		if (this.save(entity)) {
+			//TODO 先根据需求ID将原明细删除
+
+			// 保存新的明细
+			detailService.saveBatch(detailList);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean confirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo) {
+		List<PlateGoodsApply> 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);
 	}
 }

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<PlateGood
 
 	@Override
 	public IPage<PlateGoodsRecordDetail> selectPage(IPage<PlateGoodsRecordDetail> page, PlateGoodsRecordDetail entity) {
-		return null;
+		List<PlateGoodsRecordDetail> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 }

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<PlateGoodsRecordMapper, PlateGoodsRecord> implements IPlateGoodsRecordService {
 
+	private final IPlateGoodsRecordDetailService detailService;
+
 	@Override
 	public IPage<PlateGoodsRecord> selectPage(IPage<PlateGoodsRecord> page, PlateGoodsRecord entity) {
-		return null;
+		List<PlateGoodsRecord> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Override
+	public boolean save(PlateGoodsRecord entity, List<PlateGoodsRecordDetail> 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<PlateGoodsRecordDetail> detailList) {
+		if (this.save(entity)) {
+			//TODO 先根据需求ID将原明细删除
+
+			// 保存新的明细
+			detailService.saveBatch(detailList);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean confirmBatch(List<Long> ids, Integer approvalStatus, String approvalMemo) {
+		List<PlateGoodsRecord> 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);
 	}
 }

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<YieldOrderCraftM
 
 	@Override
 	public IPage<YieldOrderCraft> selectPage(IPage<YieldOrderCraft> page, YieldOrderCraft entity) {
-		return null;
+		List<YieldOrderCraft> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Override
+	public List<YieldOrderCraft> listByYoId(Long yoId) {
+		LambdaQueryWrapper<YieldOrderCraft> queryWrapper = Wrappers.lambdaQuery(YieldOrderCraft.class)
+			.eq(YieldOrderCraft::getYoId, yoId)
+			.eq(YieldOrderCraft::getIsDeleted, CommonConstant.DELETE_FALSE);
+		List<YieldOrderCraft> craftList = baseMapper.selectList(queryWrapper);
+		return craftList;
 	}
 
 	@Override

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<YieldOrderMapper, Yie
 
 	@Override
 	public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrder entity) {
+		List<YieldOrder> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
+	}
+
+	@Override
+	public boolean confirmBatch(List<Long> ids) {
+		List<YieldOrder> 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<Long> ids, Integer priority) {
+		List<YieldOrder> 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<YieldOrder> 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;
+	}
+
+
 }

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<YieldPlanMapper, Yield
 
 	@Override
 	public IPage<YieldPlan> selectPage(IPage<YieldPlan> page, YieldPlan entity) {
-		return page.setRecords(baseMapper.selectPage(page, entity));
+		List<YieldPlan> dataList = baseMapper.selectPage(page, entity);
+		return page.setRecords(dataList);
 	}
 
 	@Override
-	public JSONObject getCraftData(Long ypId) {
+	public JSONObject getCraftData(Long yieldPlanId) {
-		return null;
+		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<JSONObject> getFirstProcess(String partCode) {
-		return null;
+		List<JSONObject> 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<DsPartSub> blbSubList = dsPartSubService.listByPartCode(yieldPlan.getPartCode(), DsPartSub.SIN_TER_TYPE_BLB);
+//		if (blbSubList != null && blbSubList.size() > 0) {
+//			List<PjYieldOrder> 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<YieldPlan> queryWrapper = Wrappers.lambdaQuery(YieldPlan.class)
+			.ne(YieldPlan::getId, yieldPlanId)
+			.eq(YieldPlan::getYpCode, yieldPlanCode);
+		YieldPlan yieldPlan = baseMapper.selectOne(queryWrapper);
+		return ObjectUtil.isNotEmpty(yieldPlan);
+	}
 }