blade-service/blade-mdm/pom.xml
@@ -111,6 +111,11 @@ <artifactId>groovy-jsr223</artifactId> <version>4.0.28</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-freemarker</artifactId> </dependency> </dependencies> <build> <plugins> blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java
@@ -7,6 +7,7 @@ import org.springblade.mdm.basesetting.machine.service.MachineService; import org.springblade.mdm.basesetting.machine.entity.Machine; import org.springblade.mdm.commons.service.ParamService; import org.springblade.mdm.flow.service.TaskDispatchService; import org.springblade.mdm.machinefile.entity.MachineFile; import org.springblade.mdm.machinefile.filewatch.*; import org.springblade.mdm.machinefile.service.MachineFileScanService; @@ -32,7 +33,7 @@ private final ProgramAnnotationService annotationService; private final MachineFileScanService machineFileScanService; private final ISysClient sysClient; private final TaskDispatchService taskDispatchService; @PostConstruct public void init() { log.info("åºç¨å¯å¨æ¶æ§è¡åå§åæä½ @PostConstruct"); @@ -42,6 +43,10 @@ //å·¥æ§ç½æå¯å¨æä»¶çæ§ log.info("å·¥æ§ç½å¯å¨æä»¶çæ§"); initMachineDirMonitor(); }else{ //æ¶å¯ç½ taskDispatchService.resetDrawingNos(); } } blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/TaskDispatchMapper.java
@@ -4,7 +4,9 @@ import org.springblade.mdm.flow.entity.FlowProgramFile; import org.springblade.mdm.flow.entity.TaskDispatch; import java.util.List; public interface TaskDispatchMapper extends BladeMapper<TaskDispatch> { List<String> distinctAllDrawingNo(); } blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/TaskDispatchMapper.xml
@@ -8,6 +8,9 @@ <result column="update_time" property="updateTime"/> <result column="is_deleted" property="isDeleted"/> </resultMap> <select id="distinctAllDrawingNo" resultType="java.lang.String"> select distinct drawing_no from mdm_task_dispatch </select> </mapper> blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
@@ -22,6 +22,8 @@ import java.util.*; import com.itextpdf.text.*; import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; /** * 审æ¹è®°å½ï¼ç¨äºæ¥è¯¢æ§è¡è½¨è¿¹ * @@ -46,6 +48,9 @@ @Autowired private ApproveInfoQueryService approveInfoQueryService; @Autowired private FreeMarkerConfigurer freeMarkerConfigurer; //private static final String UNCHECK_BOX = "â"; //private static final String CHECKED_BOX = "â"; //static Chunk square = new Chunk("o", new Font(Font.FontFamily.ZAPFDINGBATS, 12)); // ç©ºæ¹æ¡ blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
@@ -1,6 +1,7 @@ package org.springblade.mdm.flow.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -10,12 +11,15 @@ import org.springblade.mdm.flow.entity.TaskDispatch; import org.springblade.mdm.flow.mapper.TaskDispatchMapper; import org.springblade.mdm.flow.vo.TaskAssignVO; import org.springblade.mdm.program.entity.DrawingNos; import org.springblade.mdm.program.mapper.DrawingNosMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; /** * 任塿´¾å·¥æ°æ® å¤çæå¡ @@ -28,7 +32,8 @@ public class TaskDispatchService extends BizServiceImpl<TaskDispatchMapper, TaskDispatch> { @Autowired private ParamService paramService; @Autowired private DrawingNosMapper drawingNosMapper; @Transactional(rollbackFor = Exception.class) public TaskDispatch saveTask(TaskAssignVO startVO,boolean isDup) { TaskDispatch taskDispatch = new TaskDispatch(); @@ -38,7 +43,25 @@ } this.save(taskDispatch); addDrawingNos(taskDispatch.getDrawingNo()); return taskDispatch; } /** * å uäººä¸ææ°æ® * @param drawingNo */ void addDrawingNos(String drawingNo){ DrawingNos data = drawingNosMapper.selectById(drawingNo); if(data == null){ data = new DrawingNos(); data.setDrawingNo(drawingNo); try { drawingNosMapper.insert(data); }catch (Exception e){ log.error("å å ¥é¶ç»ä»¶å·ä¸ææ°æ®é误"); } } } /* public void updateSuccess(long id, String instId) { @@ -74,5 +97,20 @@ return cnt > 0; } @Transactional(readOnly = true) public List<String> drawingNoSeletDropList(String drawingNo){ return drawingNosMapper.selectDropDownList(drawingNo); } @Transactional public void resetDrawingNos() { drawingNosMapper.delete(Wrappers.emptyWrapper());// List<String> dnoList = baseMapper.distinctAllDrawingNo(); for(String dno : dnoList){ DrawingNos drawingNos = new DrawingNos(); drawingNos.setDrawingNo(dno); drawingNosMapper.insert(drawingNos); } } } blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -13,6 +13,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService; import org.springblade.mdm.flow.service.FlowProgramFileService; import org.springblade.mdm.flow.service.TaskDispatchService; import org.springblade.mdm.program.entity.NcNode; import org.springblade.mdm.program.service.NcNodeService; import org.springblade.mdm.program.service.NcProgramService; @@ -38,7 +39,7 @@ private final NcNodeService ncNodeService; private final ProgramFlowStatusQueryService programFlowStatusQueryService; private final FlowProgramFileService flowProgramFileService; private final QinzheFgbService qinzheFgbService; private final TaskDispatchService taskDispatchService; /** * æ°å¢ */ @@ -121,7 +122,7 @@ @GetMapping("/drawing-no-pick") @Operation(summary = "é¦é¡µæç´¢é¶ç»ä»¶ä¸ææ°æ®", description = "æç´¢æå®é¶ç»ä»¶å·") public R<List<String>> drawingNoPick(String drawingNo) { return R.data(qinzheFgbService.seletDropList(drawingNo)); return R.data(taskDispatchService.drawingNoSeletDropList(drawingNo)); } @GetMapping("/history-by-nodeid") blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DrawingNos.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package org.springblade.mdm.program.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; /** * å®ä½ç±» * * @author yangys */ @Data @TableName("mdm_drawing_nos") @Schema(description = "é¶ç»ä»¶ä¸ææ°æ®") public class DrawingNos implements Serializable { @Serial private static final long serialVersionUID = 1L; /** * ä¸»é® */ @JsonSerialize(using = ToStringSerializer.class) @Schema(description = "主é®") @TableId(value = "drawing_no", type = IdType.ASSIGN_ID) private String drawingNo; } blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DrawingNosMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package org.springblade.mdm.program.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springblade.core.mp.mapper.BladeMapper; import org.springblade.mdm.program.entity.DrawingNos; import org.springblade.mdm.program.entity.NcNode; import org.springblade.mdm.program.vo.NcNodeOldQueryVO; import org.springblade.mdm.program.vo.NcNodeQueryVO; import org.springblade.mdm.program.vo.NcNodeVO; import java.util.List; public interface DrawingNosMapper extends BaseMapper<DrawingNos> { List<String> selectDropDownList(String drawingNo); } blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DrawingNosMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.springblade.mdm.program.mapper.DrawingNosMapper"> <!--ä¸ææ°æ®æ¥è¯¢--> <select id="selectDropDownList" resultType="java.lang.String"> select drawing_no from mdm_drawing_nos <where> <bind name="drawingNo" value="drawingNo+'%'"/> and drawing_no like #{drawingNo} </where> order by drawing_no limit 50 </select> </mapper> blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/ApproveTableServiceTest.java
@@ -20,7 +20,7 @@ public void test(){ ApproveTableService s = new ApproveTableService(); try { BaseFont bfChinese = s.getBaseFont(); Document document = new Document(PageSize.B5.rotate()); @@ -62,7 +62,7 @@ startCal.add(Calendar.DAY_OF_MONTH, 2); appInfo.setApproveDate(startCal.getTime()); s.printPage(document,bfChinese,props,machine,1,appInfo); document.close(); } catch (Exception e) {