利润总账导出问题

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/vo/AppAuditItemVO.java

@@ -65,4 +65,7 @@ public class AppAuditItemVO implements Serializable {
     // 业务类型
     private String refno4;
 
+    //审批路径名称
+    private String fidStatus;
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -33,6 +33,7 @@ import com.ruoyi.warehouseBusiness.mapper.*;
 import com.ruoyi.warehouseBusiness.service.impl.TWarehouseAgreementServiceImpl;
 import com.ruoyi.warehouseBusiness.service.impl.TWarehouseBillsServiceImpl;
 import com.ruoyi.warehouseBusiness.service.impl.TWarehousebillsModifyServiceImpl;
+import io.netty.util.internal.ObjectUtil;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -369,7 +370,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                     }
                     if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
                         if ("T".equals(at.getIffinalItem())) {
-                            fettle = 6L;
+                            if (auditItems.getFidStatus() != null && !"warehouse_status".equals(auditItems.getFidStatus())){
+                                fettle = 6L;
+                            }else {
+                                fettle = 4L;
+                            }
+
                         } else if ("F".equals(at.getIffinalItem())) {
                             fettle = 5L;
                         }

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

@@ -393,7 +393,8 @@
             w.f_trademodeid,
             w.f_qty,
             g.f_name goodsName,
-            ware.f_name warehouseName
+            ware.f_name warehouseName,
+            a.fid_status fidStatus
         FROM
             audit_items a
             LEFT JOIN t_warehousebills w ON w.f_id = a.bill_id