|
@@ -805,10 +805,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setfBilltype(billsType);
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
- wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
wbDr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
+ if (warehouseBills.getfBsdate() != null) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
@@ -825,9 +823,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
@@ -1461,9 +1457,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
@@ -1482,9 +1476,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
wbDr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
@@ -2375,8 +2367,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(user.getUserName());
|
|
|
- wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
@@ -2394,8 +2384,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(warehouseBills.getfBillno());
|
|
|
wbDr.setCreateBy(user.getUserName());
|
|
|
- wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
@@ -2711,9 +2699,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
@@ -2731,9 +2717,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbDr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
@@ -2834,9 +2818,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
@@ -2855,9 +2837,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbDr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
@@ -5812,6 +5792,176 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public AjaxResult exportVoyageDetails(TWarehouseBills tWarehouseBills) {
|
|
|
+ // 1.创建一个workbook,对应一个excel文件
|
|
|
+ HSSFWorkbook wb = new HSSFWorkbook();
|
|
|
+
|
|
|
+ // 2.在workbook中添加一个sheet,对应Excel中的sheet
|
|
|
+ HSSFSheet sheet = wb.createSheet("明细");
|
|
|
+
|
|
|
+ HSSFCellStyle cellStyle = wb.createCellStyle();
|
|
|
+ // 水平居中
|
|
|
+ cellStyle.setAlignment(HorizontalAlignment.CENTER);
|
|
|
+ // 垂直居中
|
|
|
+ cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
|
|
|
+ // 上边框
|
|
|
+ cellStyle.setBorderTop(BorderStyle.THIN);
|
|
|
+ // 下边框
|
|
|
+ cellStyle.setBorderBottom(BorderStyle.THIN);
|
|
|
+ // 左边框
|
|
|
+ cellStyle.setBorderLeft(BorderStyle.THIN);
|
|
|
+ // 右边框
|
|
|
+ cellStyle.setBorderRight(BorderStyle.THIN);
|
|
|
+
|
|
|
+ // 4.创建标题,合并标题单元格
|
|
|
+ // 行号
|
|
|
+ int rowNum = 0;
|
|
|
+
|
|
|
+ // 第一行
|
|
|
+ HSSFRow first = sheet.createRow(rowNum++);
|
|
|
+ String[] left = {"序号", "提单号", "航次", "箱型", "箱量", "始发港", "目的港", "运输条款", "货名", "装船日期", "卸船日期"};
|
|
|
+ List<String> middle = tFeesMapper.selectTFeesNameList();
|
|
|
+ String[] right = {"拖车费", "场地费", "换单费", "海运费", "合计金额", "改单费", "付款单位与日期", "换单费付费情况", "订舱公司全称", "收货公司全称", "收货公司联系人及联系方式"};
|
|
|
+ List<String> all = new ArrayList<>();
|
|
|
+ Collections.addAll(all, left);
|
|
|
+ all.addAll(middle);
|
|
|
+ Collections.addAll(all, right);
|
|
|
+
|
|
|
+ int size = all.size();
|
|
|
+ for (int i = 0; i < size; i++) {
|
|
|
+ HSSFCell tempCell = first.createCell(i);
|
|
|
+ if (i > 10 && i < size - 11) {
|
|
|
+ tempCell.setCellValue(all.get(i) + "单价");
|
|
|
+ } else {
|
|
|
+ tempCell.setCellValue(all.get(i));
|
|
|
+ }
|
|
|
+ tempCell.setCellStyle(cellStyle);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 根据船名航次查询清单
|
|
|
+ List<Map<String, Object>> list = tWarehouseBillsMapper.voyageDetails(tWarehouseBills);
|
|
|
+ if (list.size() < 1) {
|
|
|
+ return AjaxResult.error("无数据,导出Excel失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ for (Map<String, Object> map : list) {
|
|
|
+ Long fId = Long.parseLong(StringUtils.objToStr(map.get("fId")));
|
|
|
+ List<Map<String, Object>> fees = tWarehousebillsfeesMapper.voyageFeeDetails(fId, "D");
|
|
|
+
|
|
|
+ String count = map.get("fCntrcount") == null ? "0" : String.valueOf(map.get("fCntrcount"));
|
|
|
+ BigDecimal shipping = BigDecimal.ZERO;
|
|
|
+ BigDecimal documents = BigDecimal.ZERO;
|
|
|
+ BigDecimal insurance = BigDecimal.ZERO;
|
|
|
+ BigDecimal allAmount = BigDecimal.ZERO;
|
|
|
+ Map<Integer, String> feeMap = new HashMap<>();
|
|
|
+
|
|
|
+ for (Map<String, Object> fee : fees) {
|
|
|
+ String feeName = StringUtils.objToStr(fee.get("feeName"));
|
|
|
+ String unitPrice = fee.get("fUnitprice") == null ? "0" : String.valueOf(fee.get("fUnitprice"));
|
|
|
+ allAmount = allAmount.add(new BigDecimal(fee.get("fAmount") == null ? "0" : String.valueOf(fee.get("fAmount"))));
|
|
|
+ int i = middle.indexOf(feeName);
|
|
|
+ if (i >= 0) {
|
|
|
+ feeMap.put(11 + i, StringUtils.numHandle(unitPrice));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.equals(feeName, "海运费")) {
|
|
|
+ shipping = new BigDecimal(unitPrice);
|
|
|
+ }
|
|
|
+ if (StringUtils.equals(feeName, "换单费")) {
|
|
|
+ documents = new BigDecimal(unitPrice);
|
|
|
+ }
|
|
|
+ if (StringUtils.contains(feeName, "保险")) {
|
|
|
+ insurance = new BigDecimal(unitPrice);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ HSSFRow tempRow = sheet.createRow(rowNum++);
|
|
|
+ // 循环单元格填入数据
|
|
|
+ for (int j = 0; j < size; j++) {
|
|
|
+ HSSFCell tempCell = tempRow.createCell(j);
|
|
|
+ String cellValue = "";
|
|
|
+
|
|
|
+ if (j == 0) {
|
|
|
+ // 序号
|
|
|
+ cellValue = StringUtils.objToStr(map.get("rankNo"));
|
|
|
+ } else if (j == 1) {
|
|
|
+ // 提单号
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fMblno"));
|
|
|
+ } else if (j == 2) {
|
|
|
+ // 航次
|
|
|
+ cellValue = StringUtils.objToStr(map.get("voyNo"));
|
|
|
+ } else if (j == 3) {
|
|
|
+ // 箱型
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fCntrno"));
|
|
|
+ } else if (j == 4) {
|
|
|
+ // 箱量
|
|
|
+ cellValue = count;
|
|
|
+ } else if (j == 5) {
|
|
|
+ // 始发港
|
|
|
+ cellValue = StringUtils.objToStr(map.get("loadportName"));
|
|
|
+ } else if (j == 6) {
|
|
|
+ // 目的港
|
|
|
+ cellValue = StringUtils.objToStr(map.get("destportName"));
|
|
|
+ } else if (j == 7) {
|
|
|
+ // 运输条款
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fLoadportMode")) + "-" + StringUtils.objToStr(map.get("fDestportMode"));
|
|
|
+ } else if (j == 8) {
|
|
|
+ // 货名
|
|
|
+ cellValue = StringUtils.objToStr(map.get("goodsName"));
|
|
|
+ } else if (j == 9) {
|
|
|
+ // 装船日期
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fEtd"));
|
|
|
+ } else if (j == 10) {
|
|
|
+ // 卸船日期
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fEta"));
|
|
|
+ } else if (j == size - 9) {
|
|
|
+ // 换单费
|
|
|
+ cellValue = documents.multiply(new BigDecimal(count)).toString();
|
|
|
+ } else if (j == size - 8) {
|
|
|
+ // 海运费
|
|
|
+ cellValue = (shipping.add(insurance)).multiply(new BigDecimal(count)).toString();
|
|
|
+ } else if (j == size - 7) {
|
|
|
+ // 合计金额
|
|
|
+ cellValue = allAmount.toString();
|
|
|
+ } else if (j == size - 3) {
|
|
|
+ // 收货公司名称
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fShippername"));
|
|
|
+ } else if (j == size - 2) {
|
|
|
+ // 收货公司全称
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fConsigneername"));
|
|
|
+ } else if (j == size - 1) {
|
|
|
+ // 收货公司联系人及联系方式
|
|
|
+ cellValue = StringUtils.objToStr(map.get("fConsigneetel"));
|
|
|
+ }
|
|
|
+ tempCell.setCellValue(StringUtils.numHandle(cellValue));
|
|
|
+ tempCell.setCellStyle(cellStyle);
|
|
|
+ }
|
|
|
+
|
|
|
+ feeMap.forEach((key, value) -> {
|
|
|
+ tempRow.getCell(key).setCellValue(value);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ for (int i = 0; i < size; i++) {
|
|
|
+ sheet.autoSizeColumn(i);
|
|
|
+ sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 导出excel
|
|
|
+ String fileName = list.get(0).get("voyNo").toString() + "航次收支明细表.xls";
|
|
|
+ try {
|
|
|
+ OutputStream out = new FileOutputStream(getAbsoluteFile(fileName));
|
|
|
+ wb.write(out);
|
|
|
+ wb.close();
|
|
|
+ out.close();
|
|
|
+ return AjaxResult.success(fileName);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ return AjaxResult.error("导出Excel失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public AjaxResult deleteOrder(TWarehouseBills tWarehouseBills, LoginUser loginUser) {
|
|
|
TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(tWarehouseBills.getfId());
|
|
|
if (warehouseBills == null) {
|
|
@@ -7436,9 +7586,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbCr.setCreateTime(new Date());
|
|
|
wbCr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbCr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbCr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
@@ -7463,9 +7611,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbDr.setCreateTime(new Date());
|
|
|
wbDr.setSrcBillNo(tWarehouseBills.getfBillno());
|
|
|
wbDr.setCreateBy(loginUser.getUser().getUserName());
|
|
|
- //wbDr.setfChargedate(warehouseBills.getfChargedate());
|
|
|
- //wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
|
|
|
- if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
|
|
|
+ if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
|
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
|
}
|
|
|
tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|