diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java index 9a556266..dfc88a2e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java @@ -49,8 +49,10 @@ public class DsTaskBillDTO extends DsTaskBillEntity { private String fillMemo; - private List fillingDetailList; +// private List fillingDetailList; +// +// private List deleteIds; - private List deleteIds; + private String fileUrl; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java index 90662a8a..d523f8b4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java @@ -325,4 +325,23 @@ public class DsPartEntity extends BaseEntity { @Schema(description = "子件类型") private String subType; + /** + * 玻璃饼直径 + */ + @Schema(description = "玻璃饼直径") + private BigDecimal blbDiameter; + + /** + * 壳体最大外径 + */ + @Schema(description = "壳体最大外径") + private BigDecimal externalDiameter; + + + /** + * 镀层厚度2 + */ + @Schema(description = "镀层厚度2") + private BigDecimal plateThicknessTwo; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java index fb61ae42..39d036a5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java @@ -122,4 +122,10 @@ public class DsSpecialProEntity extends BaseEntity { @Schema(description = "设备名称") private String equipmentName; + /** + * 同步状态 + */ + @Schema(description = "同步状态") + private String syncStatus; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java index ce23357d..414e1a2a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java @@ -123,6 +123,12 @@ public class DsTaskBillEntity extends BaseEntity { @Schema(description = "设备名称") private String equipmentName; + /** + * 文件路径 + */ + @Schema(description = "文件路径") + private String fileUrl; + /** * 未处理 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java index dc01eeb7..5a0d5f3d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import org.springblade.desk.dashboard.pojo.entity.DsSpecialProEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,4 +43,10 @@ public class DsSpecialProVO extends DsSpecialProEntity { @Serial private static final long serialVersionUID = 1L; + /** + * 文件路径 + */ + @Schema(description = "文件路径") + private String fileUrl; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java index 8b50aeb9..6e7f70c0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.controller; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -41,6 +42,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.pojo.dto.DsTaskBillDTO; import org.springblade.desk.dashboard.pojo.entity.BsFillingDetailEntity; import org.springblade.desk.dashboard.service.IBsFillingDetailService; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -185,10 +187,12 @@ public class DsTaskBillController extends BladeController { public R handleDsTaskBill(@Valid @RequestBody DsTaskBillDTO dto) { Long tbId = dto.getTbId(); String fillMemo = dto.getFillMemo(); - List fillingDetailList = dto.getFillingDetailList(); - List deleteIds = dto.getDeleteIds(); + String fileUrl = dto.getFileUrl(); + if(tbId == null || StringUtils.isEmpty(fileUrl)){ + return R.fail("tbId 和 fileUrl 不能为空"); + } - return R.status(dsTaskBillService.handleDsTaskBill(tbId,fillMemo,fillingDetailList,deleteIds)); + return R.status(dsTaskBillService.handleDsTaskBill(tbId,fillMemo,fileUrl)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index cbdce1b4..0a3644e6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -127,6 +127,10 @@ + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SpecialProMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SpecialProMapper.xml index 6e1e58bb..07075cd8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SpecialProMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SpecialProMapper.xml @@ -24,17 +24,20 @@ + - + select sp.*,tb.FILE_URL from DS_SPECIAL_PRO sp left join DS_TASK_BILL tb on sp.ID = tb.SP_ID + where sp.is_deleted = 0 - and WC_ID = #{dsSpecialPro.wcId} + and sp.WC_ID = #{dsSpecialPro.wcId} - and EQUIPMENT_ID = #{dsSpecialPro.equipmentId} + and sp.EQUIPMENT_ID = #{dsSpecialPro.equipmentId} + order by sp.UPDATE_TIME desc @@ -46,6 +49,8 @@ SELECT * FROM ds_special_pro a WHERE IS_DELETED = 0 AND to_char(NVL(a.last_due_time, a.create_time) - a.rem_days, 'yyyy-mm-dd HH24:MI:SS') < #{nextRunTimeStr} + AND a.SYNC_STATUS = 0 + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml index 92a0d70c..2ee3767f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml @@ -25,6 +25,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskBillService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskBillService.java index d0196b16..e470735b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskBillService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskBillService.java @@ -68,9 +68,8 @@ public interface IDsTaskBillService extends BaseService { *处理特殊工艺任务 * @param tbId * @param fillMemo - * @param fillingDetailList - * @param deleteIds + * @param fileUrl * @return */ - boolean handleDsTaskBill(Long tbId, String fillMemo, List fillingDetailList, List deleteIds); + boolean handleDsTaskBill(Long tbId, String fillMemo,String fileUrl); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java index 5ec3a6f4..fe30c926 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service.impl; import com.alibaba.druid.sql.visitor.functions.Function; import com.google.common.base.Strings; +import lombok.extern.slf4j.Slf4j; import org.springblade.desk.dashboard.pojo.entity.BsFillingDetailEntity; import org.springblade.desk.dashboard.pojo.entity.DsSpecialProEntity; import org.springblade.desk.dashboard.pojo.entity.DsTaskBillEntity; @@ -53,6 +54,7 @@ import java.util.List; * @author BladeX * @since 2025-11-22 */ +@Slf4j @Service public class DsTaskBillServiceImpl extends BaseServiceImpl implements IDsTaskBillService { @@ -82,12 +84,10 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl spList = specialProService.listSpByTime(nextRunTimeStr); if(CollectionUtils.isEmpty(spList)){ return; @@ -97,10 +97,6 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl fillingDetailList, List deleteIds) { + public boolean handleDsTaskBill(Long tbId, String fillMemo,String fileUrl) { DsTaskBillEntity dsTaskBill = taskBillMapper.selectById(tbId); dsTaskBill.setFillMemo(fillMemo); dsTaskBill.setTbStatus(DsTaskBillEntity.TBSTATUS_END); + dsTaskBill.setFileUrl(fileUrl); int update = taskBillMapper.updateById(dsTaskBill); //存入上次处理时间 @@ -136,16 +142,6 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl 0) { - for (BsFillingDetailEntity fillingDetail : fillingDetailList) { - fillingDetail.setBusId(tbId); - fillingDetail.setBusType(BsFillingDetailEntity.DS_TASK_BILL); - fillingDetailService.save(fillingDetail); - } - } - if (deleteIds.size() > 0) { - fillingDetailService.deleteLogic(deleteIds); - } return true; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 316451bf..55417631 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -356,7 +356,12 @@ public class DsTaskingServiceImpl extends BaseServiceImpl partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); for (DsPartRelationEntity dsPartRelationEntity : partRelationEntityList) { DsPartEntity zPartEntity = partService.getById(dsPartRelationEntity.getChildPartId()); - if(null != zPartEntity){ + assert zPartEntity != null; + if(null != zPartEntity.getSinTerType()){ + List zCraftList = craftService.getPartCraft(zPartEntity.getId(),"2"); + if(CollectionUtils.isEmpty(zCraftList) ){ + throw new ServiceException("子件工艺缺失"); + } //检验子件超期 if(null == zPartEntity.getNextDue()){ throw new ServiceException("【子件号】"+zPartEntity.getPartCode()+"工艺超期"); @@ -365,13 +370,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl zCraftList = craftService.getPartCraft(zPartEntity.getId(),"2"); - if(CollectionUtils.isEmpty(zCraftList) ){ - throw new ServiceException("子件工艺缺失"); - } // List zProcessEntities = processService.selectDsProcessByCraftId(zCraft.getId()); // if(CollectionUtils.isEmpty(zProcessEntities)){ // throw new ServiceException("【子件号】工艺未编制工序"); @@ -1005,6 +1003,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl