diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/OemCraftAbilityEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/OemCraftAbilityEntity.java index 5740da813..636f4fafe 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/OemCraftAbilityEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/OemCraftAbilityEntity.java @@ -1,31 +1,5 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.basic.pojo.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -34,7 +8,6 @@ import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; import java.math.BigDecimal; -import java.util.List; /** * 工艺能力关联其他表 实体类 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java index 941c39403..64888d264 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java @@ -25,6 +25,25 @@ public class WorkOrderRun extends BaseEntity { @Serial private static final long serialVersionUID = 1L; + public WorkOrderRun(Long woId, String woCode, Short runType, Long outTeam, Long inTeam, Long outCustomer, + Long inCustomer, String memo, Long approvalMan, String systemData, String collaborate) { + this.woId = woId; + this.woCode = woCode; + this.runType = runType; + this.outTeam = outTeam; + this.inTeam = inTeam; + this.outCustomer = outCustomer; + this.inCustomer = inCustomer; + this.memo = memo; + this.approvalMan = approvalMan; + this.systemData = systemData; + this.collaborate = collaborate; + this.runStatus = RUN_STATUS_ISSUED; + } + + public WorkOrderRun() { + } + /** * 待外协 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SaveProCheckDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SaveProCheckDTO.java new file mode 100644 index 000000000..4ca95fcd1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SaveProCheckDTO.java @@ -0,0 +1,29 @@ +package org.springblade.desk.quality.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.List; + +/** + * 工序检验保存 数据传输对象实体类 + * + * @author litao + * @since 2026年5月22日 + */ +@Data +public class SaveProCheckDTO { + + @Schema(description = "检验任务") + private InspectionTask inspectionTask; + + @Schema(description = "检验项目") + private WorkPlanItemVO workPlanItemVO; + + @Schema(description = "检验详情") + private List wpItemDetailList; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index 1beacbdf3..ceec6be29 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -1,6 +1,3 @@ -/** - * Author: Tom Shuo - */ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -27,159 +24,6 @@ public class InspectionTask extends BaseEntity { @Serial private static final long serialVersionUID = 1L; - /** - * [检验任务]编码 - */ - public static final String COL_CODE = "CODE"; - /** - * [检验任务]类型 - */ - public static final String COL_INSPECTION_TASK_TYPE = "INSPECTION_TASK_TYPE"; - /** - * [检验任务] - */ - public static final String COL_NAME = "NAME"; - /** - * [车间订单]id - */ - public static final String COL_WO_ID = "WO_ID"; - /** - * [制品]id - */ - public static final String COL_PRODUCT_ID = "PRODUCT_ID"; - /** - * [工序]id - */ - public static final String COL_PROCESS_ID = "PROCESS_ID"; - /** - * 质检员[用户]id - */ - public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; - /** - * [制品]编码 - */ - public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; - /** - * [制品]序列号 - */ - public static final String COL_PRODUCT_SN = "PRODUCT_SN"; - /** - * 生产批次号 - */ - public static final String COL_BATCH_NUMBER = "BATCH_NUMBER"; - /** - * [车间订单]编码 - */ - public static final String COL_WO_CODE = "WO_CODE"; - /** - * [工序]编码 - */ - public static final String COL_PROCESS_CODE = "PROCESS_CODE"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - /** - * 计划开始时间 - */ - public static final String COL_PLANNED_START_DATE = "PLANNED_START_DATE"; - /** - * 计划结束时间 - */ - public static final String COL_PLANNED_END_DATE = "PLANNED_END_DATE"; - /** - * 实际开始时间 - */ - public static final String COL_ACTUAL_START_DATE = "ACTUAL_START_DATE"; - /** - * 实际结束时间 - */ - public static final String COL_ACTUAL_END_DATE = "ACTUAL_END_DATE"; - /** - * 检验样本数量 - */ - public static final String COL_SIMPLE_COUNT = "SIMPLE_COUNT"; - /** - * 检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA - */ - public static final String COL_CHECK_RESULT = "CHECK_RESULT"; - /** - * 检验数量 - */ - public static final String COL_CHECK_QTY = "CHECK_QTY"; - /** - * 消耗数量 - */ - public static final String COL_LOSS_QTY = "LOSS_QTY"; - /** - * 合格数量 - */ - public static final String COL_QUALIFIED_QTY = "QUALIFIED_QTY"; - /** - * 报废数量 - */ - public static final String COL_SCRAP_QTY = "SCRAP_QTY"; - /** - * 不合格数量 - */ - public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; - /** - * 不良原因 - */ - public static final String COL_POOR_REASON = "POOR_REASON"; - /** - * 不良描述 - */ - public static final String COL_POOR_MEMO = "POOR_MEMO"; - /** - * 检验日期 - */ - public static final String COL_CHECK_DATE = "CHECK_DATE"; - /** - * 审理单状态 - */ - public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; - /** - * 检验备注 - */ - public static final String COL_CHECK_MEMO = "CHECK_MEMO"; - /** - * 返工数 - */ - public static final String COL_REWORK_QTY = "REWORK_QTY"; - /** - * [作业计划]id - */ - public static final String COL_WP_ID = "WP_ID"; - /** - * 来源类型 - */ - public static final String COL_FROM_TYPE = "FROM_TYPE"; - /** - * [生产订单]类型 - */ - public static final String COL_YIELD_ORDER_TYPE = "YIELD_ORDER_TYPE"; - /** - * [生产订单]id - */ - public static final String COL_YIELD_ORDER_ID = "YIELD_ORDER_ID"; - /** - * 接收日期 - */ - public static final String COL_RECEIVE_DATE = "RECEIVE_DATE"; - /** - * [工序]名称 - */ - public static final String COL_PROCESS_NAME = "PROCESS_NAME"; - /** - * 额定工时(分钟) - */ - public static final String COL_STANDARD_WORK_MINUTE = "STANDARD_WORK_MINUTE"; - /** - * 准备工时(分钟) - */ - public static final String COL_PREPARE_WORK_MINUTE = "PREPARE_WORK_MINUTE"; - /** * 未检验 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index 561ee6d31..733c1b521 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -1,6 +1,3 @@ -/** - * Author: Tom Shuo - */ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java index 38fb79577..2c1867a98 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java @@ -7,16 +7,11 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.common.exception.BusinessException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; -import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; -import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; -import org.springblade.desk.oldv1.constant.Constant; -import org.springblade.desk.oldv1.pojo.ResultInfo; import org.springblade.desk.produce.pojo.vo.BindModelVO; import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO; import org.springblade.desk.produce.service.IPdaLoadService; @@ -101,8 +96,9 @@ public class PdaLoadController { @PostMapping(value = "/saveProCheck") @ApiOperationSupport(order = 9) - @Operation(summary = "工艺检验保存", description = "") + @Operation(summary = "工序检验保存") public R saveProCheck(@RequestBody InspectionTask inspectionTask) { + // SaveProCheckDTO下次修改为SaveProCheckDTO实体类接收 return R.status(pdaLoadService.saveProCheck(inspectionTask)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java index 238a1f6db..657a4956b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java @@ -13,6 +13,7 @@ import org.springblade.desk.produce.pojo.entity.WorkPlan; import org.springblade.desk.produce.pojo.vo.BindModelVO; import org.springblade.desk.produce.pojo.vo.LoadSubOrderVO; import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO; +import org.springblade.desk.quality.pojo.dto.SaveProCheckDTO; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java index 98eb38091..cef1c2a7a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java @@ -291,4 +291,9 @@ public interface IWorkOrderService extends BaseService { Map getInspectionRecordHead(Long woId); Map getInspectionRecord(Long woId); + + /** + * 生产运行记录 + */ + void addPrWorkOrderRun(WorkOrder workOrder); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 2bbdf6be4..3ac6f771d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -1,6 +1,5 @@ package org.springblade.desk.produce.service.impl; -import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -22,8 +21,6 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.service.IEquipmentService; import org.springblade.desk.device.service.IFeiBaSetService; import org.springblade.desk.device.service.IRackSetService; -import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; -import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; import org.springblade.desk.energy.service.IBsDosingRecService; import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; @@ -42,9 +39,8 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.IWorkPlanItemService; import org.springblade.scheduling.pojo.entity.CraftAbilityEntity; -import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; @@ -97,10 +93,10 @@ public class PdaLoadServiceImpl extends BaseServiceImpl planItemDetails = workPlanItemDetailService.listByWoId(woId); Map> itemDetailMap = planItemDetails.stream() .collect(Collectors.groupingBy(WorkPlanItemDetail::getWorkPlanItemId)); - for (WorkPlanItemVO planItem : planItemLst) { + for (WorkPlanItemVO planItem : planItemLst) { List itemDetails = itemDetailMap.get(planItem.getId()); String checkManByNewErp = null; try { @@ -2821,8 +2817,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl map = new HashMap<>(12); map.put("projectNo", planItem.getItemCode()); map.put("equipmentName", itemDetail.getTools()); @@ -2872,9 +2868,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl data, BladeUser user) throws Exception { // 提取参数