|
@@ -18,6 +18,7 @@ import com.ruoyi.finance.domain.TFeeDo;
|
|
import com.ruoyi.finance.domain.TWareHouseFees;
|
|
import com.ruoyi.finance.domain.TWareHouseFees;
|
|
import com.ruoyi.finance.excel.Charge;
|
|
import com.ruoyi.finance.excel.Charge;
|
|
import com.ruoyi.finance.excel.Contrast;
|
|
import com.ruoyi.finance.excel.Contrast;
|
|
|
|
+import com.ruoyi.finance.excel.Detailed;
|
|
import com.ruoyi.finance.excel.Payment;
|
|
import com.ruoyi.finance.excel.Payment;
|
|
import com.ruoyi.finance.mapper.TFeeDoMapper;
|
|
import com.ruoyi.finance.mapper.TFeeDoMapper;
|
|
import com.ruoyi.finance.mapper.TFeeMapper;
|
|
import com.ruoyi.finance.mapper.TFeeMapper;
|
|
@@ -640,6 +641,39 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
return list1;
|
|
return list1;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public List<Detailed> selectDetailedList(Long fId) {
|
|
|
|
+ List<Detailed> detailedList = tFeeMapper.selectDetailedList(fId);
|
|
|
|
+ List<Detailed> detailedList1 = new ArrayList<>();
|
|
|
|
+ for (Detailed tWareHouseExcelItem : detailedList){
|
|
|
|
+ if(StringUtils.isNotNull(tWareHouseExcelItem.getfBusinessType())){
|
|
|
|
+ List<SysDictData> sysDictDataListIn = new ArrayList<>();
|
|
|
|
+ SysDictData sysDictData =new SysDictData();
|
|
|
|
+ if(tWareHouseExcelItem.getfBilltype().equals("入库")){
|
|
|
|
+ sysDictData.setDictType("st_in_type");
|
|
|
|
+ sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
|
|
|
|
+ sysDictData.setStatus("0");
|
|
|
|
+ sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
|
|
|
|
+ } else if (tWareHouseExcelItem.getfBilltype().equals("出库")){
|
|
|
|
+ sysDictData.setDictType("st_out_type");
|
|
|
|
+ sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
|
|
|
|
+ sysDictData.setStatus("0");
|
|
|
|
+ sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
|
|
|
|
+ } else if (tWareHouseExcelItem.getfBilltype().equals("调拨") | tWareHouseExcelItem.getfBilltype().equals("货物通关") ){
|
|
|
|
+ sysDictData.setDictType("st_trans_type");
|
|
|
|
+ sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
|
|
|
|
+ sysDictData.setStatus("0");
|
|
|
|
+ sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
|
|
|
|
+ }
|
|
|
|
+ if(null!=sysDictDataListIn && sysDictDataListIn.size()>0){
|
|
|
|
+ tWareHouseExcelItem.setfBusinessType(sysDictDataListIn.get(0).getDictLabel());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ detailedList1.add(tWareHouseExcelItem);
|
|
|
|
+ }
|
|
|
|
+ return detailedList1;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 更新费用明细
|
|
* 更新费用明细
|
|
* @param fid
|
|
* @param fid
|