[CODE]: 财务对账回显展示字典表数据

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/ITFeeService.java

@@ -106,4 +106,6 @@ public interface ITFeeService {
      * @return
      */
     public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(Long  fId);
+
+    public  String  findCtrlcorpid (Long  fId);
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.basicData.domain.TFees;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -20,6 +21,7 @@ import com.ruoyi.finance.mapper.TFeeMapper;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.warehouseBusiness.domain.*;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
@@ -71,6 +73,10 @@ public class TFeeServiceImpl implements ITFeeService {
     @Autowired
     private AuditItemsServiceImpl auditItemsService;
 
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
+
+
 
     /**
      * 查询财务数据主
@@ -107,6 +113,12 @@ public class TFeeServiceImpl implements ITFeeService {
                 TFees tFees= tFeesMapper.selectTFeesById(fees.getfFeeid());
                 // 费用表数据
                 TWarehousebillsfees tWarehousebillsfees = tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(fees.getfSrcid());
+                // 字典宝
+                SysDictData sysDictData =new SysDictData();
+                sysDictData.setDictType("data_unitfees");
+                sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfFeeunitid()));
+                sysDictData.setStatus("0");
+                List<SysDictData> sysDictDataList = iSysDictDataService.selectDictDataList(sysDictData);
                 map1.put("fId",fees.getfId());
                 map1.put("fSrcid",fees.getfSrcid());
                 map1.put("fSrcpid",fees.getfSrcpid());
@@ -126,6 +138,9 @@ public class TFeeServiceImpl implements ITFeeService {
                 map1.put("fBillingDeadline",tWarehousebillsfees.getfBillingDeadline());
                 map1.put("fBillingDays",tWarehousebillsfees.getfBillingDays());
                 map1.put("fInventoryDays",tWarehousebillsfees.getfInventoryDays());
+                map1.put("fFeeunitid",sysDictDataList.get(0).getDictLabel());
+                map1.put("fQty",tWarehousebillsfees.getfQty());
+                map1.put("fUnitprice",tWarehousebillsfees.getfUnitprice());
                 if(tWarehousebills.getfBilltype().equals("SJRK")){
                     map1.put("fBilltype","入库");
                 } else if(tWarehousebills.getfBilltype().equals("SJCK")){
@@ -199,6 +214,7 @@ public class TFeeServiceImpl implements ITFeeService {
      * @return
      */
     @Override
+    @Transactional
     public AjaxResult insertTFeeTFeeDo(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
         Long fPid = null;
         Map<String, Object> map = new HashMap<>();
@@ -508,6 +524,13 @@ public class TFeeServiceImpl implements ITFeeService {
         return tFeeMapper.selectTWarehousebillsItemsList(fId);
     }
 
+    @Override
+    public String findCtrlcorpid(Long fId) {
+        TFee tFee=tFeeMapper.selectTFeeById(fId);
+        String exportName = tFee.getfCtrlcorpid()+"-"+tFee.getfBillno();
+        return exportName;
+    }
+
     /**
      *  更新费用明细
      * @param fid

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -318,7 +318,6 @@
             t.f_id AS fSrcpid,
             t.f_corpid AS fCorpid,
             c.f_name AS fName,
-            w.fId AS fId,
             w.fName AS fFeesName,
             t.f_bscorpno AS fBscorpno,
             w.f_mblno AS fMblno,
@@ -337,7 +336,10 @@
             f.f_name AS fFeeName,
             w.f_dc AS fSrcdc,
             ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmtdr,
-            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmt
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmt,
+            dict.dict_label AS fFeeunitid,
+            w.f_qty AS fQty ,
+            w.f_unitprice AS  fUnitprice
         FROM
             t_warehousebills t
             LEFT JOIN t_corps c ON c.f_id = t.f_corpid
@@ -385,7 +387,10 @@
                     LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
                 ) w ON w.f_pid = t.f_id
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
+            LEFT JOIN sys_dict_data dict ON dict.dict_value = w.f_feeUnitid
         <where>
+            dict.status = '0'
+            AND dict.dict_type = 'data_unitfees'
             <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.f_corpid = #{map.tWareHouseFees.fCorpid} </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
             <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
@@ -550,22 +555,27 @@
                 END AS fBilltype,
             wi.f_product_name AS fGoodsid,
             wi.f_marks AS fMarks,
+            dict.dict_label AS fFeeunitid,
             wi.f_qty AS fBillingQty,
+            wi.f_unitprice  AS fUnitprice,
             wi.f_bsdate AS fBsdate,
             wi.f_inventory_days AS fInventoryDays,
             wi.f_billing_days AS fBillingDays,
             f.f_name AS fFeeid,
-            wi.f_accamount AS fAmt2
+            w.f_amt AS fAmt2
         FROM
             t_fee_do w
                 LEFT JOIN t_warehousebillsfees wi ON w.f_srcid = wi.f_id
                 LEFT JOIN t_fees  f ON wi.f_feeid = f.f_id
+                LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_feeUnitid
            ,(
             SELECT
                 @ii := 0
         ) AS ii
         WHERE
-            w.f_pid = #{fId}
+            dict.status = '0'
+            AND dict.dict_type = 'data_unitfees'
+            AND w.f_pid = #{fId}
     </select>
 
 </mapper>