yangys
2025-09-18 a3048fa6fa72fa3cc5da2c43c59bd000e00c9599
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -68,13 +68,16 @@
            approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
            approvedService.updateById(approved);
            NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
            if(pkgNode.isDeviationProgram()){
            NcNodeHis pkgNodeHis = this.ncNodeHisService.getById(approved.getNcNodeId());
            if(pkgNodeHis.isDeviationProgram()){
               //偏离单的程序,如果审批导出记录是解锁形成的,还是需要锁定;普通试切过的,不锁定
               HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
               if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
                  pkgNode.lock("下发导出锁定");
                  ncNodeService.updateById(pkgNode);
                  NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
                  if(pkgNode != null) {
                     pkgNode.lock("下发导出锁定");
                     ncNodeService.updateById(pkgNode);
                  }
               }
            }
         }
@@ -179,7 +182,7 @@
    * @param zipOut zip输出流
    * @param inputStream 输入流
    * @param entryName 文件名
    * @throws IOException
    * @throws IOException 写文件异常
    */
   void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
      throws IOException {