[CODE]: 财务审批添加字段值

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -359,7 +359,9 @@ public class TFeeServiceImpl implements ITFeeService {
             auditItems.setActId(actId);
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(tFee.getfBillno()); // 业务编号
-            auditItems.setRefno1(tFee.getfBilltype()); // 财务类型
+            auditItems.setRefno1(tFee.getfBillno());
+            auditItems.setRefno2(tFee.getfBilltype());// 财务类型
+            auditItems.setRefno3(tFee.getfBilltype());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(loginUser.getUsername());
             auditItems.setSendTime(new Date());

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditPathsLevelsMapper.xml

@@ -30,7 +30,7 @@
             lev.remarks
         FROM
             audit_paths_acts act
-            LEFT JOIN audit_paths_levels lev ON act.id = lev.path_id
+            LEFT JOIN audit_paths_levels lev ON act.path_id = lev.path_id
         where
             act.act_id = #{actId}
     </select>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -215,24 +215,25 @@
             /*判断确认对账*/
             <if test="map.billType == 'DZ'">
                 f_statement_no = #{map.tFee.fBillno},
-                f_accamount = f_accamount + #{map.tFee.fAmtcr},
+                f_accamount = f_accamount + #{map.tFeeDo.fAmt},
                 f_accamount_date =  #{map.tFee.fAccbilldate}
             </if>
             /*判断撤销对账*/
             <if test="map.billType == 'DZRevoke'">
                 f_statement_no =  #{map.tFee.fBillno},
+                f_accamount = f_accamount - #{map.tFeeDo.fAmt},
                 f_accamount_date = #{map.tFee.fAccbilldate}
             </if>
             /*判断收付款*/
             <if test="map.billType == 'DC'">
                 f_stlamount_no = #{map.tFee.fBillno},
-                f_stlamount = f_stlamount +  #{map.tFee.fAmtcr},
+                f_stlamount = f_stlamount +  #{map.tFeeDo.fAmt},
                 f_stlamount_date =#{map.tFee.fAccbilldate}
             </if>
             /*判断撤销收付款*/
             <if test="map.billType == 'DCRevoke'">
                 f_stlamount_no = #{map.tFee.fBillno},
-                f_stlamount = f_stlamount -  #{map.tFee.fAmtcr},
+                f_stlamount = f_stlamount -  #{map.tFeeDo.fAmt},
                 f_stlamount_date =#{map.tFee.fAccbilldate}
             </if>
         </trim>