diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java new file mode 100644 index 00000000..25c0e10f --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java @@ -0,0 +1,157 @@ +package org.springblade.desk.produce.pojo.dto; + +import java.util.List; + +public class PrintChildCheck implements java.io.Serializable { + + /** + * @return 序号 + * @Author dxl + * @CreateTime 2022/11/7 10:24 + */ + private String testOrders; + /** + * @return 检验细项 + * @Author dxl + * @CreateTime 2022/11/8 16:22 + */ + private List cccList; + + /** + * @return 抽样数 + * @Author dxl + * @CreateTime 2022/11/7 9:25 + */ + private String checkQty; + /** + * @return 合格，不合格，NA + * @Author dxl + * @CreateTime 2022/11/7 9:25 + */ + private String checkResult; + /** + * @return 姓名 + * @Author dxl + * @CreateTime 2022/11/7 9:25 + */ + private String checkName; + /** + * @return 检验日期 + * @Author dxl + * @CreateTime 2022/11/7 9:25 + */ + private String checkDate; + + /** + * 试验数量 + */ + private String testQty; + /** + * @return 检测项目名称 + */ + private String testName; + /** + * @return 检测项目实验标准 + */ + private String trialStandard; + + /** + * @return 设备编码 + */ + private String deviceCode; + + /** + * @return 检验印章URL + */ + private String imgUrl; + public String getTestOrders() { + return testOrders; + } + + public void setTestOrders(String testOrders) { + this.testOrders = testOrders; + } + + public String getCheckQty() { + return checkQty; + } + + public void setCheckQty(String checkQty) { + this.checkQty = checkQty; + } + + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } + + public String getCheckDate() { + return checkDate; + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getCheckResult() { + return checkResult; + } + + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public List getCccList() { + return cccList; + } + + public void setCccList(List cccList) { + this.cccList = cccList; + } + + public String getTestQty() { + return testQty; + } + + public void setTestQty(String testQty) { + this.testQty = testQty; + } + + public String getTestName() { + return testName; + } + + public void setTestName(String testName) { + this.testName = testName; + } + + public String getTrialStandard() { + return trialStandard; + } + + public void setTrialStandard(String trialStandard) { + this.trialStandard = trialStandard; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public PrintChildCheck() { + } + + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java new file mode 100644 index 00000000..0b9e1548 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java @@ -0,0 +1,91 @@ +package org.springblade.desk.produce.pojo.dto; + +/** + * @version V1.0 + * @Title: PrintChildCheckChild + * @Author: dxl + * @CreateTime: 2022/11/8 16:18 + */ +public class PrintChildCheckChild implements java.io.Serializable { + + /** + * @return 名称 + * @Author dxl + * @CreateTime 2022/11/7 10:24 + */ + private String testName; + /** + * @return 实验标准 + * @Author dxl + * @CreateTime 2022/11/7 10:34 + */ + private String trialStandard; + /** + * @return 检验值 + * @Author dxl + * @CreateTime 2022/11/7 10:34 + */ + private String checkValue; + /** + * @return 设备量具 + * @Author dxl + * @CreateTime 2022/11/7 10:24 + */ + private String emTools; + /** + * @return 检验项Id + * @Author dxl + * @CreateTime 2022/11/8 17:09 + */ + private Long wpiId; + + public String getTestName() { + return testName; + } + + public void setTestName(String testName) { + this.testName = testName; + } + + public String getEmTools() { + return emTools; + } + + public void setEmTools(String emTools) { + this.emTools = emTools; + } + + public String getTrialStandard() { + return trialStandard; + } + + public void setTrialStandard(String trialStandard) { + this.trialStandard = trialStandard; + } + + public String getCheckValue() { + return checkValue; + } + + public void setCheckValue(String checkValue) { + this.checkValue = checkValue; + } + + public Long getWpiId() { + return wpiId; + } + + public void setWpiId(Long wpiId) { + this.wpiId = wpiId; + } + + public PrintChildCheckChild(String testName, String trialStandard, String checkValue, Long wpiId) { + this.testName = testName; + this.trialStandard = trialStandard; + this.checkValue = checkValue; + this.wpiId = wpiId; + } + + public PrintChildCheckChild() { + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java new file mode 100644 index 00000000..f0f88c04 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java @@ -0,0 +1,56 @@ +package org.springblade.desk.produce.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDate; +import java.util.Date; + +/** + * + * @author litao + */ +@Data +@TableName("DS_RB_FILE_PRESERVE") +@Schema(description = "DsRbFilePreserve对象") +@EqualsAndHashCode(callSuper = true) +public class DsRbFilePreserve extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "作业中心") + private Long wcId; + + @Schema(description = "工序") + private Long ppsId; + + @Schema(description = "线上线下") + private String line; + + @Schema(description = "维护时间") + private LocalDate keepTime; + + @Schema(description = "维护人") + private Long keepMan; + + @Schema(description = "名称") + private String name; + + + @Schema(description = "审批状态") + private Short approvalStatus = -1; + + @Schema(description = "状态") + private Short rfpStatus = 1; + + @Schema(description = "升版ID") + private String versionId; + + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java index 1357d5cf..cdda06f1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java @@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springblade.desk.produce.pojo.dto.PrintChildCheck; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; @@ -327,5 +328,11 @@ public class WorkPlan extends BaseEntity { private List qcProduceRunsList; @TableField(exist = false) private Integer totalPreserve = 0; + @TableField(exist = false) + private MesBsAdditionalMessEntity bsAdditionalMess; + @TableField(exist = false) + private List dsRbFilePreserveSlotList; + @TableField(exist = false) + private List printChildCheck; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java new file mode 100644 index 00000000..de4816af --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.produce.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve; + +import java.util.Date; + +/** + * 加工记录 视图实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class DsRbFilePreserveVO extends DsRbFilePreserve { + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java index 2b877e52..42e51c4b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java @@ -71,5 +71,11 @@ public class RaiseHand extends BaseEntity { @Schema(description = "免责金额") private BigDecimal amount; + /** + * raisHand文件 + */ + @Schema(description = "文件路径") + private String fileUrl; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java index f692cc79..de41be20 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java @@ -3,10 +3,12 @@ */ package org.springblade.desk.quality.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; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; @@ -149,4 +151,32 @@ public class WorkPlanItemDetail extends BaseEntity { */ @Schema(description = "实际[量具]id") private Long actMtId; + + + @TableField(exist = false) + private String trialItem; + @TableField(exist = false) + private String trialStandard; + @TableField(exist = false) + private Long wpiId; + + + public String getGaugeValueNotNUll() { + StringBuffer sb = new StringBuffer(); + + if(StringUtils.isNotBlank(this.gaugeValue2) && this.gaugeValue6 != "/"){ + sb.append(this.gaugeValue1+"/"+this.gaugeValue2+"/"); + + } + + if(StringUtils.isNotBlank(this.gaugeValue4) && this.gaugeValue4 != "/"){ + sb.append(this.gaugeValue3+"/"+this.gaugeValue4+"/"); + + } + if(StringUtils.isNotBlank(this.gaugeValue6) && this.gaugeValue6 != "/"){ + sb.append(this.gaugeValue5+"/"+this.gaugeValue6+"/"); + + } + return sb.toString(); + } } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 3db55df9..ff1795f4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -123,4 +123,6 @@ public class InspectionTaskListVO extends InspectionTask { private String ppsName; + private Integer yieldType; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java new file mode 100644 index 00000000..8cfb68a5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java @@ -0,0 +1,58 @@ +package org.springblade.desk.produce.controller; + +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.common.utils.CommonUtil; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.desk.produce.pojo.dto.ShiftTransferDTO; +import org.springblade.desk.produce.pojo.dto.TaskCompleteDTO; +import org.springblade.desk.produce.pojo.dto.TaskCompleteOrderDTO; +import org.springblade.desk.produce.pojo.entity.*; +import org.springblade.desk.produce.pojo.vo.ByCardNoByPlanVO; +import org.springblade.desk.produce.pojo.vo.DsRbFilePreserveVO; +import org.springblade.desk.produce.pojo.vo.TaskCompleteVO; +import org.springblade.desk.produce.service.IDisTaskingService; +import org.springblade.desk.produce.service.IDsRbFilePreserveService; +import org.springblade.desk.produce.service.IPdaSaveService; +import org.springblade.desk.produce.service.IWorkPlanLogService; +import org.springblade.system.cache.UserCache; +import org.springblade.system.pojo.entity.User; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * + * + * @author litao + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/DisTaskingController") +public class DsRbFilePreserveController extends BladeController { + + private final IDsRbFilePreserveService dsRbFilePreserveService; + + + + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @Operation(summary = "调度任务分派", description = "传入taskCompleteDTO") + public R> disTaskHandle(DsRbFilePreserve taskCompleteDTO, Query query) { + return R.data(null); + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java new file mode 100644 index 00000000..9be78d25 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java @@ -0,0 +1,19 @@ +package org.springblade.desk.produce.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve; +import org.springblade.desk.produce.pojo.entity.MacToolUse; +import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; +import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; + +import java.util.List; + +/** + * + * @author BladeX + */ +public interface DsRbFilePreserveMapper extends BaseMapper { + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml new file mode 100644 index 00000000..8e3fe10d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java index a1b2c26b..e0e6e632 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java @@ -2,14 +2,16 @@ package org.springblade.desk.produce.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.entity.DsPartSub; import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO; -import org.springblade.desk.produce.pojo.entity.MacToolUse; -import org.springblade.desk.produce.pojo.entity.MakeRec; -import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; -import org.springblade.desk.produce.pojo.entity.WorkPlan; +import org.springblade.desk.produce.pojo.entity.*; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorWorkPlanVO; import org.springblade.desk.produce.pojo.vo.WorkPlanLoadVO; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; import org.springblade.scheduling.pojo.entity.WorkPlanEntity; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.produce.pojo.vo.WorkPlanVO; @@ -44,15 +46,38 @@ public interface WorkPlanMapper extends BaseMapper { MesQcProduceRunEntity getBoxInfo(Long wpId); List listSlotInfoGr (Long wpId, Boolean aTrue); - List listSlotInfo (Long wpId,Boolean aTrue); + List listSlotInfoList (Long wpId,Boolean aTrue); List listMacToolUse(Long wpId,Boolean aTrue); MakeRec getByWpId(Long wpId); - Object[] getConcatMrByWpId(Long wpId); +// Object[] getConcatMrByWpId(Long wpId); + WorkPlan getConcatMrByWpId(Long wpId); List listPrByWpIdIndex(Long wpId, Integer index,boolean aTrue); List getDataByWpIdAndIndexList(Long wpId, String indexNum); List listPrByWpIdIndexAndMtnCode(Long wpId, Integer indexNum,String mtnCode); - List getBoxInfoByWpIdMtnCode(Long wpId); + List getBoxInfoByWpIdMtnCodeList(Long wpId); List getByRfpsId(Long rfpsId); MacToolUse getHangNumIsNull(Long wpId); + MacToolUse getDataByWpIdAndIndex(Long wpId, String numberIndex); + List getDataByWcIdAndPpsId(Long wcId, Long ppsId,boolean aTrue); + List getByRfpId(Long rfpId); +// MesQcProduceRunEntity getBoxInfoByWpIdMtnCode(Long wpId); + + MesBsAdditionalMessEntity getDataByOneData(String mtnCode,Short indexNum); + + List findFatherByYoIdMes(Long yoId); + + List listByWoIdAllMes(Long woId); + + List listSjSlotInfoMes(Long wpId, Boolean aTrue); + List listByWpIdMes(Long wpId); + List findCubByYoIdMes(Long yoId); + List listByPartCodeNew(String partCode, Short indexNum); + List findByPartCodeAndMemoMes(String partCode, String memo); + DsPartSub getByPartCodeAndSubCodeMes(String partCode, String subCode); + String getCheckManByNewErpMes(String userName); + + List listByWpiIdMes(Long wpiId); + + List getQcReviewSheetListMes(String partCode,String batchNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index e97988a1..c9d36bb8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -97,7 +97,7 @@ - select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea, a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from ( select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area, @@ -122,7 +122,7 @@ select * from MES_MAKE_REC a - where a.wpId= #{wpId} + where a.wp_id= #{wpId} order by a.ID desc - + select * from MES_WORK_ORDER a left join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.FATHER_YO_ID = #{yoId} + + + + + + + + + + + + + + + + + @@ -147,7 +187,7 @@ and b.work_slot != '烘箱' - order by mtn_code, b.pr_id + order by mtn_code, b.id - + select a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.area, a.sumArea as totalArea,a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type + from ( + select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area, + sum(b.WORK_QTY*d.PO_AREA) over() as sumArea, + a.MTN_CODE, d.prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a + inner join MES_WORK_PLAN b on a.WP_ID = b.WP_ID + inner join MES_WORK_ORDER c on b.WO_ID = c.ID + inner join MES_YIELD_ORDER d on c.YO_ID = d.ID + inner join ds_part f on d.part_code = f.part_code + where a.MTN_CODE in( + select a.MTN_CODE from MES_MAC_TOOL_USE a + left join DE_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID + where a.WP_ID = #{wpId} + + and b.CATEGORYS = '产线设备' + + + and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null ) + + ) and a.mtu_index = '2' + )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea, + a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type + + + + + + + + + + + + + + + + + +