仓储列表数据按创建时间排序、单条请核列表状态显示异常修改

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

@@ -22,6 +22,7 @@ import com.ruoyi.finance.mapper.TFeeMapper;
 import com.ruoyi.finance.service.impl.TFeeServiceImpl;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
+import com.ruoyi.warehouseBusiness.component.CalculationWarehouseService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreement;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
@@ -102,6 +103,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Autowired
     private TWarehouseAgreementMapper tWarehouseAgreementMapper;
 
+    @Autowired
+    private CalculationWarehouseService calculationWarehouseService;
+
     /**
      * 查询审批流配置主
      *
@@ -663,6 +667,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
         }
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         if (number <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("该审批已被操作");
@@ -890,6 +900,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
         }
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         if (number <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("该审批已被操作");
@@ -1095,6 +1111,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             warehousebillsModifyService.withdrawalApprovalById(auditItems.getBillId());
         }
         auditItemsMapper.deletePurchaseApproval(auditItems);
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         return AjaxResult.success();
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/CalculationWarehouseService.java

@@ -23,4 +23,11 @@ public interface CalculationWarehouseService {
      */
     void calculationWarehouseQuantity(TWarehouseBills warehouseBills);
 
+    /**
+     * 仓库计算费用状态
+     *
+     * @param warehouseBills 主表数据
+     */
+    void calculationFeeStatus(TWarehouseBills warehouseBills);
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/impl/CalculationWarehouseServiceImpl.java

@@ -103,6 +103,16 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
     }
 
     /**
+     * 仓库计算费用状态
+     *
+     * @param warehouseBills 主表数据
+     */
+    @Override
+    public void calculationFeeStatus(TWarehouseBills warehouseBills) {
+        judgeFeeStatus(warehouseBills);
+    }
+
+    /**
      * 判断修改费用状态
      *
      * @param warehouseBills 仓库主表
@@ -113,13 +123,20 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
         List<TWarehousebillsfees> warehousebillsfees = warehousebillsfeesMapper.selectTWarehousebillsfeesList(fees);
         if (CollectionUtils.isNotEmpty(warehousebillsfees)) {
             long count = warehousebillsfees.stream().filter(fee -> Objects.equals(fee.getfBillstatus(), 6L)).count();
-            if (Objects.equals(count, (long) warehousebillsfees.size())) {
+            long size =  warehousebillsfees.size();
+            if (Objects.equals(count, size)) {
+                // 入账数和明细数相等，全部入账
                 warehouseBills.setfFeeStatus(3L);
-            } else {
+            } else if (count > 0 && count < size) {
+                // 入账数 < 明细数，部分入账
                 warehouseBills.setfFeeStatus(2L);
+            } else {
+                // 暂存
+                warehouseBills.setfFeeStatus(1L);
             }
         } else {
-            warehouseBills.setfFeeStatus(1L);
+            // 空，不显示状态
+            warehouseBills.setfFeeStatus(0L);
         }
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -6881,6 +6881,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             throw new WarehouseException("未找到费用信息或费用已被审核");
         }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.APPROVE.getType()), new Date());
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(warehousebillsfees.getfPid());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success(tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(id));
     }
 
@@ -6900,6 +6904,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             throw new WarehouseException("未找到费用信息或费用已计算费用");
         }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.SAVE.getType()), new Date());
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(warehousebillsfees.getfPid());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success(tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(id));
     }
 

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

@@ -245,8 +245,9 @@
             bill.f_billing_deadline AS fBillingDeadline,
             bill.free_container_date AS freeContainerDate,
             CASE
+            WHEN bill.f_fee_status = '0'THEN ''
             WHEN bill.f_fee_status = '1'THEN '暂存'
-            WHEN bill.f_fee_status = '2'THEN '部分'
+            WHEN bill.f_fee_status = '2'THEN '部分入账'
             WHEN bill.f_fee_status = '3'THEN '全部入账'
             END AS fFeeStatus,
         CASE WHEN bill.f_billstatus = '1' THEN '录入'
@@ -412,7 +413,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.create_time DESC, bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectWarehouseBusinessList1" parameterType="TWarehousebills" resultType="Map">
@@ -448,8 +449,9 @@
             bill.f_billing_deadline AS fBillingDeadline,
             bill.free_container_date AS freeContainerDate,
             CASE
+            WHEN bill.f_fee_status = '0'THEN ''
             WHEN bill.f_fee_status = '1'THEN '暂存'
-            WHEN bill.f_fee_status = '2'THEN '部分'
+            WHEN bill.f_fee_status = '2'THEN '部分入账'
             WHEN bill.f_fee_status = '3'THEN '全部入账'
             END AS fFeeStatus,
             CASE
@@ -577,7 +579,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.create_time DESC, bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -2776,4 +2778,4 @@
             ORDER BY w.f_bsdate DESC, w.f_bstime DESC,w.f_id DESC,w.f_billstatus
     </select>
 
-</mapper>
+</mapper>