仓库业务->修改bug

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -356,6 +356,16 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
         String username = SecurityUtils.getUsername();
         tWarehouse.setCreateTime(new Date());
         tWarehouse.setCreateBy(username);
+        TWarehouse info = tWarehouseMapper.selectTWarehouseById(tWarehouse.getParentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (!UserConstants.DEPT_NORMAL.equals(info.getfStatus())) {
+            throw new CustomException("部门停用，不允许新增");
+        }
+        tWarehouse.setAncestors(info.getAncestors() + "," + tWarehouse.getParentId());
+        // 所有节点转换成中文拼接
+        String fWarehouseInformation = warehouseName(info.getAncestors() + "," + tWarehouse.getParentId(), tWarehouse.getfName());
+        tWarehouse.setfWarehouseInformation(fWarehouseInformation);
+        tWarehouse.setfStatus("0");
         tWarehouseMapper.insertTWarehouse(tWarehouse);
 
         if (CollectionUtils.isNotEmpty(tWarehouse.getAnnexList())) {

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

@@ -3,8 +3,10 @@ package com.ruoyi.warehouseBusiness.component.impl;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.ruoyi.warehouseBusiness.component.CalculationWarehouseService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import com.ruoyi.warehouseBusiness.domain.enums.WarehouseTypeEnum;
+import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +25,8 @@ import java.util.Objects;
 @AllArgsConstructor
 public class CalculationWarehouseServiceImpl implements CalculationWarehouseService {
 
+    private final TWarehousebillsfeesMapper warehousebillsfeesMapper;
+
     private final TWarehousebillsitemsMapper warehousebillsitemsMapper;
 
 
@@ -60,6 +64,7 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
                 warehouseBills.setfItemsStatus(2L);
             }
         }
+        judgeFeeStatus(warehouseBills);
     }
 
     /**
@@ -97,4 +102,25 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
         }
     }
 
+    /**
+     * 判断修改费用状态
+     *
+     * @param warehouseBills 仓库主表
+     */
+    private void judgeFeeStatus(TWarehouseBills warehouseBills) {
+        TWarehousebillsfees fees = new TWarehousebillsfees();
+        fees.setfPid(warehouseBills.getfId());
+        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())) {
+                warehouseBills.setfFeeStatus(3L);
+            } else {
+                warehouseBills.setfFeeStatus(2L);
+            }
+        } else {
+            warehouseBills.setfFeeStatus(1L);
+        }
+    }
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -596,6 +596,10 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "入库明细审批状态")
     private Long fItemstatus;
 
+    /** 费用状态 */
+    @Excel(name = "入库明细审批状态")
+    private Long fFeeStatus;
+
     /**查询箱号*/
     @Excel(name = "箱号")
     private String fCntrno;
@@ -833,6 +837,14 @@ public class TWarehouseBills extends BaseEntity {
         this.warehousebillsfeesCr = warehousebillsfeesCr;
     }
 
+    public Long getfFeeStatus() {
+        return fFeeStatus;
+    }
+
+    public void setfFeeStatus(Long fFeeStatus) {
+        this.fFeeStatus = fFeeStatus;
+    }
+
     public String getfCntval() {
         return fCntval;
     }

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

@@ -118,6 +118,7 @@
         <result property="fCargoPlanning"    column="f_cargo_planning"    />
         <result property="fArrivalStatus"    column="f_arrival_status"    />
         <result property="fDismountStatus"    column="f_dismount_status"    />
+        <result property="fFeeStatus"    column="f_fee_status"    />
     </resultMap>
 
     <resultMap type="WarehouseBillsVO" id="WarehousebillsVOResult">
@@ -139,7 +140,7 @@
         f_truckno, f_driver_name, f_driver_tel, f_driver_id_car, f_business_type, f_labour, f_fleet, f_inwarehouseid, f_bstime, f_cartype, f_goodsid, f_new_trademodeid,
         f_loadportid, f_destportid, f_serviceitems, f_invoceobj, f_sign, f_detentioncargo, f_booksmarks, f_shippername, f_shipperattn, f_shippertel, f_consigneername,
         f_consigneeattn, f_consigneetel, f_insurance, f_insuranceamt, f_closedate, f_docmentdate, f_vslid, f_voyid, f_typeid, f_paymode, f_laneid, f_cntval,
-        free_container_date, f_business_attribution, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
+        free_container_date, f_business_attribution, f_fee_status, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
         f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed, f_chargetype,f_weigh_weight,
         f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees,f_cargo_planning,
         f_arrival_status,f_dismount_status from t_warehousebills
@@ -229,6 +230,7 @@
             bill.f_truckno AS fTruckno,
             bill.f_driver_name AS fDriverName,
             bill.f_driver_tel AS fDriverTel,
+            bill.f_fee_status fFeeStatus,
             bill.f_driver_id_car AS fDriverIdCar,
             dictIn.dict_label AS fBusinessType,
             ware.f_name AS fWarehouseid,
@@ -427,6 +429,7 @@
             bill.f_truckno AS fTruckno,
             bill.f_driver_name AS fDriverName,
             bill.f_driver_tel AS fDriverTel,
+            bill.f_fee_status fFeeStatus,
             bill.f_driver_id_car AS fDriverIdCar,
             ware.f_name AS fWarehouseid,
             bill.f_qty AS fQty,
@@ -924,6 +927,7 @@
             <if test="fDeleteStatus != null">f_delete_status,</if>
             <if test="fRemarksFees != null">f_remarks_fees,</if>
             <if test="fCargoPlanning != null">f_cargo_planning,</if>
+            <if test="fFeeStatus != null">f_fee_status,</if>
             <if test="fArrivalStatus != null">f_arrival_status,</if>
             <if test="fDismountStatus != null">f_dismount_status,</if>
         </trim>
@@ -1038,6 +1042,7 @@
             <if test="fDeleteStatus != null">#{fDeleteStatus},</if>
             <if test="fRemarksFees != null">#{fRemarksFees},</if>
             <if test="fCargoPlanning != null">#{fCargoPlanning},</if>
+            <if test="fFeeStatus != null">#{fFeeStatus},</if>
             <if test="fArrivalStatus != null">#{fArrivalStatus},</if>
             <if test="fDismountStatus != null">#{fDismountStatus},</if>
         </trim>
@@ -1156,6 +1161,7 @@
             <if test="fDeleteStatus != null">f_delete_status = #{fDeleteStatus},</if>
             <if test="fRemarksFees != null">f_remarks_fees = #{fRemarksFees},</if>
             <if test="fCargoPlanning != null">f_cargo_planning = #{fCargoPlanning},</if>
+            <if test="fFeeStatus != null">f_fee_status = #{fFeeStatus},</if>
             <if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
             <if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
         </trim>
@@ -1276,6 +1282,7 @@
             <if test="fDeleteStatus != null">f_delete_status = #{fDeleteStatus},</if>
             <if test="fRemarksFees != null">f_remarks_fees = #{fRemarksFees},</if>
             <if test="fCargoPlanning != null">f_cargo_planning = #{fCargoPlanning},</if>
+            <if test="fFeeStatus != null">f_fee_status = #{fFeeStatus},</if>
             <if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
             <if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
         </trim>
@@ -2737,7 +2744,7 @@
 
     <select id="selecStorageFeeList" resultType="Map">
         SELECT DISTINCT w.f_id AS fId, w.f_billno AS fBillno, corp.f_name AS fCorpid, w.f_billing_deadline AS fBillingDeadline, w.remark,
-                        w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime
+                        w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime, w.f_fee_status fFeeStatus
         FROM t_warehousebills w LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
             LEFT JOIN t_corps corp ON corp.f_id = w.f_corpid
             left join sys_user u on w.create_by = u.user_name