src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -264,6 +264,14 @@ } } // 入库审核 if (approveProcess.getApproveType().equals(9)) { StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId()); if (!approveNode.isInventoryReview()) { stockInRecord.setApproveStatus(3); stockInRecordService.updateById(stockInRecord); } } // 绑定附件 if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) { tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue()); @@ -287,7 +295,14 @@ approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!", Arrays.asList(Long.valueOf(id)), "/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId()); } else if (approveProcess.getApproveType() == 9) { } else { sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()), approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!", Arrays.asList(Long.valueOf(id)), "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId()); } } else { if (approveProcess.getApproveType() == 9) { StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId()); if (approveNode.isInventoryReview()) { if ("不合格入库".equals(approveNode.getStorageType())) { @@ -297,22 +312,7 @@ } stockInRecord.setApproveStatus(2); stockInRecordService.updateById(stockInRecord); sysNoticeService.simpleNoticeByUser( approveProcessType(approveProcess.getApproveType()), approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!", Arrays.asList(Long.valueOf(id)), "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId() ); }else { stockInRecord.setApproveStatus(3); stockInRecordService.updateById(stockInRecord); } } else { sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()), approveProcess.getApproveId() + "流程编号的审批需要您审核!!!!!", Arrays.asList(Long.valueOf(id)), "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId()); } } break; src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -136,7 +136,7 @@ } catch (Exception e) { e.printStackTrace(); } stockInRecordDto.setApproveStatus(2); stockInRecordDto.setApproveStatus(1); return stockInRecordMapper.updateById(stockInRecordDto); } } src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -77,6 +77,7 @@ stockInRecordDto.setRemark(stockInventoryDto.getRemark()); stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum()); stockInRecordDto.setLockedQuantity(stockInventoryDto.getLockedQuantity()); stockInRecordDto.setApproveStatus(0); stockInRecordDto.setType("0"); Long id = stockInRecordService.add(stockInRecordDto); LoginUser loginUser = SecurityUtils.getLoginUser(); src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -63,6 +63,7 @@ stockInRecordDto.setStockInNum(stockUninventoryDto.getQualitity()); stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId()); stockInRecordDto.setRemark(stockUninventoryDto.getRemark()); stockInRecordDto.setApproveStatus(0); stockInRecordDto.setType("1"); Long id = stockInRecordService.add(stockInRecordDto);
@@ -31,20 +31,21 @@ <result column="tenant_id" property="tenantId" /> </resultMap> <select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto"> select st.*, su.nick_name assessmentUserName, count(std.id) nums from safe_training st left join safe_training_details std on std.safe_training_id = st.id left join sys_user su on st.assessment_user_id = su.user_id where st.state = #{c.state} GROUP BY st.id SELECT st.*, su.nick_name AS assessmentUserName, COUNT(std.id) AS nums FROM safe_training st LEFT JOIN safe_training_details std ON std.safe_training_id = st.id LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id WHERE st.state = #{c.state} <if test="c.placeTraining != null and c.placeTraining != ''"> and st.place_training like concat('%', #{c.placeTraining}, '%') AND st.place_training LIKE CONCAT('%', #{c.placeTraining}, '%') </if> <if test="c.trainingDate != null "> and st.training_date = date_format(#{c.trainingDate},'%Y%m%d') AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d') </if> GROUP BY st.id, su.nick_name </select> <select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto"> select st.*, src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -75,7 +75,7 @@ LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id LEFT JOIN product_order po ON po.id = pwo.product_order_id WHERE sir.id = 233 sir.id = #{id} ORDER BY sir.id DESC </select>
