权限控制，导出修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * 凯和订单Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-04-08
  */
@@ -437,7 +437,7 @@ public class KHTWarehousebillsController extends BaseController
      * @param tWarehousebillsfeesDr
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('warehouse:warehousebills:ruoYiSubmitMessage')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     //@Log(title = "凯和若依订单提交", businessType = BusinessType.DELETE)
     @PostMapping("/cancellationFees")
     public AjaxResult cancellationFees(@RequestParam(value = "tWarehousebills") String tWarehousebills,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TChargeController.java

@@ -165,7 +165,7 @@ public class TChargeController extends BaseController {
     /**
      *   撤销收费
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:charge:revoke')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/revoke")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TContrastController.java

@@ -171,7 +171,7 @@ public class TContrastController extends BaseController {
     /**
      *   撤销对账
      */
-    @PreAuthorize("@ss.hasPermi('finance:contrast:add')")
+    @PreAuthorize("@ss.hasPermi('finance:contrast:revoke')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/revoke")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TInvoiceController.java

@@ -41,7 +41,7 @@ public class TInvoiceController extends BaseController {
     /**
      * 查询财务数据主列表
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:list')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:list')")
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TFee tFee) {
@@ -56,7 +56,7 @@ public class TInvoiceController extends BaseController {
     /**
      * 导出财务数据主列表
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:export')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:export')")
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
@@ -72,16 +72,16 @@ public class TInvoiceController extends BaseController {
     /**
      * 获取财务数据主详细信息
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:query')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(tFeeService.selectTFeeById(fId));
     }
 
     /**
-     * 新增财务数据主  
+     * 新增财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -95,14 +95,14 @@ public class TInvoiceController extends BaseController {
     /**
      * 删除财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(tFeeService.deleteTFeeByIds(fIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('finance:charge:remove')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -112,7 +112,7 @@ public class TInvoiceController extends BaseController {
     /**
      * 发票查询
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:list')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:list')")
     @GetMapping("/invoiceList")
     public TableDataInfo chargeList(TWareHouseFees tWareHouseFees) {
         startPage();
@@ -123,7 +123,7 @@ public class TInvoiceController extends BaseController {
     /**
      * 确认收费
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/confirm")
     @RepeatSubmit
@@ -138,7 +138,7 @@ public class TInvoiceController extends BaseController {
     /**
      * 撤销收费
      */
-    @PreAuthorize("@ss.hasPermi('finance:charge:add')")
+    @PreAuthorize("@ss.hasPermi('finance:invoice:revoke')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/revoke")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TPaymentController.java

@@ -160,7 +160,7 @@ public class TPaymentController extends BaseController {
     /**
      *   撤销付费
      */
-    @PreAuthorize("@ss.hasPermi('finance:payment:add')")
+    @PreAuthorize("@ss.hasPermi('finance:payment:revoke')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/revoke")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.java

@@ -56,7 +56,7 @@ public class TStorageFeeCalculationController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:edit')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -194,7 +194,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:revoke')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInAndOutStockController.java

@@ -129,7 +129,7 @@ public class TWarehouseInAndOutStockController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills)throws Exception  {
-        tWarehouseBills.setfBilltype("SJCK");
+        tWarehouseBills.setfBilltype("CDZZ");
         List<OutStock> list = itWarehouseBillsService.outStockExport(tWarehouseBills);
         ExcelUtil<OutStock> util = new ExcelUtil<>(OutStock.class);
         return util.exportExcel(list, "场地直装");
@@ -226,7 +226,7 @@ public class TWarehouseInAndOutStockController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:edit')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -213,7 +213,7 @@ public class TWarehouseInStockController extends BaseController {
     /**
      * 撤销已审核通过的入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:revoke')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -228,7 +228,7 @@ public class TWarehouseOutStockController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:edit')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -250,7 +250,7 @@ public class TWarehouseStockTransferController extends BaseController {
     /**
      * 撤销入库信息
      */
-    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:edit')")
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:revoke')")
     @Log(title = "详情主表", businessType = BusinessType.UPDATE)
     @GetMapping("/withdrawById/{fId}")
     @RepeatSubmit

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

@@ -76,6 +76,18 @@ public class TWarehousebillsModify extends BaseEntity {
     private Long fWarehouseid;
 
     /**
+     * 船名
+     */
+    @Excel(name = "船名")
+    private Long fVslid;
+
+    /**
+     * 航次
+     */
+    @Excel(name = "航次")
+    private Long fVoyid;
+
+    /**
      * 状态
      */
     @Excel(name = "状态")
@@ -188,6 +200,22 @@ public class TWarehousebillsModify extends BaseEntity {
         this.fWarehouseid = fWarehouseid;
     }
 
+    public Long getfVslid() {
+        return fVslid;
+    }
+
+    public void setfVslid(Long fVslid) {
+        this.fVslid = fVslid;
+    }
+
+    public Long getfVoyid() {
+        return fVoyid;
+    }
+
+    public void setfVoyid(Long fVoyid) {
+        this.fVoyid = fVoyid;
+    }
+
     public String getfStatus() {
         return fStatus;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/GoodsTransfer.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -84,13 +85,13 @@ public class GoodsTransfer {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "毛重（KG）")
-    private Float fGrossweight;
+    private BigDecimal fGrossweight;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "净重（KG）")
-    private Float fNetweight;
+    private BigDecimal fNetweight;
 
 
     /**
@@ -180,19 +181,19 @@ public class GoodsTransfer {
         this.fQty = fQty;
     }
 
-    public Float getfGrossweight() {
+    public BigDecimal getfGrossweight() {
         return fGrossweight;
     }
 
-    public void setfGrossweight(Float fGrossweight) {
+    public void setfGrossweight(BigDecimal fGrossweight) {
         this.fGrossweight = fGrossweight;
     }
 
-    public Float getfNetweight() {
+    public BigDecimal getfNetweight() {
         return fNetweight;
     }
 
-    public void setfNetweight(Float fNetweight) {
+    public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/InStock.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -78,13 +79,13 @@ public class InStock  {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "入库毛重（KG）")
-    private Float fGrossweight;
+    private BigDecimal fGrossweight;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "入库净重（KG）")
-    private Float fNetweight;
+    private BigDecimal fNetweight;
 
     /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
     @Excel(name = "业务类别")
@@ -242,19 +243,19 @@ public class InStock  {
         this.fQty = fQty;
     }
 
-    public Float getfGrossweight() {
+    public BigDecimal getfGrossweight() {
         return fGrossweight;
     }
 
-    public void setfGrossweight(Float fGrossweight) {
+    public void setfGrossweight(BigDecimal fGrossweight) {
         this.fGrossweight = fGrossweight;
     }
 
-    public Float getfNetweight() {
+    public BigDecimal getfNetweight() {
         return fNetweight;
     }
 
-    public void setfNetweight(Float fNetweight) {
+    public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/OutStock.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -71,7 +72,7 @@ public class OutStock  {
      * 计划件数,由明细表自动合计生成
      */
     @Excel(name = "计划件数")
-    private Long fPlanqty;
+    private Integer fPlanqty;
 
     /**
      * 件数,由明细表自动合计生成
@@ -83,13 +84,13 @@ public class OutStock  {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "出库毛重（KG）")
-    private Float fGrossweight;
+    private BigDecimal fGrossweight;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "出库净重（KG）")
-    private Float fNetweight;
+    private BigDecimal fNetweight;
 
     /** 车号 */
     @Excel(name = "车号")
@@ -117,12 +118,12 @@ public class OutStock  {
     @Excel(name = "费用状态")
     private String fBillstatus;
 
-    
+
     public String getCreateBy() {
         return createBy;
     }
 
-   
+
     public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
@@ -135,102 +136,102 @@ public class OutStock  {
         this.fStorekeeper = fStorekeeper;
     }
 
-    
+
     public String getfCorpid() {
         return fCorpid;
     }
 
-    
+
     public void setfCorpid(String fCorpid) {
         this.fCorpid = fCorpid;
     }
 
-    
+
     public String getfMblno() {
         return fMblno;
     }
 
-    
+
     public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
 
-    
+
     public String getfProductName() {
         return fProductName;
     }
 
-    
+
     public void setfProductName(String fProductName) {
         this.fProductName = fProductName;
     }
 
-    
+
     public String getfMarks() {
         return fMarks;
     }
 
-    
+
     public void setfMarks(String fMarks) {
         this.fMarks = fMarks;
     }
 
-    
+
     public String getfTruckno() {
         return fTruckno;
     }
 
-    
+
     public void setfTruckno(String fTruckno) {
         this.fTruckno = fTruckno;
     }
 
-    
+
     public String getfDriverName() {
         return fDriverName;
     }
 
-    
+
     public void setfDriverName(String fDriverName) {
         this.fDriverName = fDriverName;
     }
 
-    
+
     public String getfDriverTel() {
         return fDriverTel;
     }
 
-    
+
     public void setfDriverTel(String fDriverTel) {
         this.fDriverTel = fDriverTel;
     }
 
-    
+
     public String getfDriverIdCar() {
         return fDriverIdCar;
     }
 
-    
+
     public void setfDriverIdCar(String fDriverIdCar) {
         this.fDriverIdCar = fDriverIdCar;
     }
 
-    
+
     public String getfBusinessType() {
         return fBusinessType;
     }
 
-    
+
     public void setfBusinessType(String fBusinessType) {
         this.fBusinessType = fBusinessType;
     }
 
-    
+
     public String getfBillstatus() {
         return fBillstatus;
     }
 
-    
+
     public void setfBillstatus(String fBillstatus) {
         this.fBillstatus = fBillstatus;
     }
@@ -259,11 +260,11 @@ public class OutStock  {
         this.fWarehouseid = fWarehouseid;
     }
 
-    public Long getfPlanqty() {
+    public Integer getfPlanqty() {
         return fPlanqty;
     }
 
-    public void setfPlanqty(Long fPlanqty) {
+    public void setfPlanqty(Integer fPlanqty) {
         this.fPlanqty = fPlanqty;
     }
 
@@ -275,19 +276,19 @@ public class OutStock  {
         this.fQty = fQty;
     }
 
-    public Float getfGrossweight() {
+    public BigDecimal getfGrossweight() {
         return fGrossweight;
     }
 
-    public void setfGrossweight(Float fGrossweight) {
+    public void setfGrossweight(BigDecimal fGrossweight) {
         this.fGrossweight = fGrossweight;
     }
 
-    public Float getfNetweight() {
+    public BigDecimal getfNetweight() {
         return fNetweight;
     }
 
-    public void setfNetweight(Float fNetweight) {
+    public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/QueryMenu.java

@@ -60,13 +60,13 @@ public class QueryMenu {
      * 金额
      */
     @Excel(name = "金额")
-    private BigDecimal fAmount;
+    private Float fAmount;
 
     /**
      * 结算金额
      */
     @Excel(name = "结算金额")
-    private BigDecimal fStlamount;
+    private Float fStlamount;
 
     /**
      * 结算日期
@@ -78,7 +78,7 @@ public class QueryMenu {
      * 开票金额
      */
     @Excel(name = "开票金额")
-    private BigDecimal fInvamount;
+    private Float fInvamount;
 
     /**
      * 发票号
@@ -90,7 +90,7 @@ public class QueryMenu {
      * 对账金额
      */
     @Excel(name = "对账金额")
-    private BigDecimal fAccamount;
+    private Float fAccamount;
 
     /**
      * 对账日期
@@ -108,7 +108,7 @@ public class QueryMenu {
      * 计价单位
      */
     @Excel(name = "计价单位", readConverterExp = "1=件数,2=毛重,3=净重,4=尺码,5=固定,6=其他,7=箱量")
-    private Long fFeeunitid;
+    private Integer fFeeunitid;
 
     /**
      * 数量
@@ -120,7 +120,7 @@ public class QueryMenu {
      * 单价
      */
     @Excel(name = "单价")
-    private BigDecimal fUnitprice;
+    private Float fUnitprice;
 
     /**
      * 业务类型
@@ -140,7 +140,6 @@ public class QueryMenu {
     @Excel(name = "备注")
     private String remark;
 
-
     public String getCorpName() {
         return corpName;
     }
@@ -197,19 +196,19 @@ public class QueryMenu {
         this.fDc = fDc;
     }
 
-    public BigDecimal getfAmount() {
+    public Float getfAmount() {
         return fAmount;
     }
 
-    public void setfAmount(BigDecimal fAmount) {
+    public void setfAmount(Float fAmount) {
         this.fAmount = fAmount;
     }
 
-    public BigDecimal getfStlamount() {
+    public Float getfStlamount() {
         return fStlamount;
     }
 
-    public void setfStlamount(BigDecimal fStlamount) {
+    public void setfStlamount(Float fStlamount) {
         this.fStlamount = fStlamount;
     }
 
@@ -221,11 +220,11 @@ public class QueryMenu {
         this.fStlamountDate = fStlamountDate;
     }
 
-    public BigDecimal getfInvamount() {
+    public Float getfInvamount() {
         return fInvamount;
     }
 
-    public void setfInvamount(BigDecimal fInvamount) {
+    public void setfInvamount(Float fInvamount) {
         this.fInvamount = fInvamount;
     }
 
@@ -237,11 +236,11 @@ public class QueryMenu {
         this.fInvnos = fInvnos;
     }
 
-    public BigDecimal getfAccamount() {
+    public Float getfAccamount() {
         return fAccamount;
     }
 
-    public void setfAccamount(BigDecimal fAccamount) {
+    public void setfAccamount(Float fAccamount) {
         this.fAccamount = fAccamount;
     }
 
@@ -261,11 +260,11 @@ public class QueryMenu {
         this.fStatementNo = fStatementNo;
     }
 
-    public Long getfFeeunitid() {
+    public Integer getfFeeunitid() {
         return fFeeunitid;
     }
 
-    public void setfFeeunitid(Long fFeeunitid) {
+    public void setfFeeunitid(Integer fFeeunitid) {
         this.fFeeunitid = fFeeunitid;
     }
 
@@ -277,11 +276,11 @@ public class QueryMenu {
         this.fQty = fQty;
     }
 
-    public BigDecimal getfUnitprice() {
+    public Float getfUnitprice() {
         return fUnitprice;
     }
 
-    public void setfUnitprice(BigDecimal fUnitprice) {
+    public void setfUnitprice(Float fUnitprice) {
         this.fUnitprice = fUnitprice;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/StockTransfer.java

@@ -3,6 +3,7 @@ package com.ruoyi.warehouseBusiness.excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -77,7 +78,7 @@ public class StockTransfer {
      * 计划件数,由明细表自动合计生成
      */
     @Excel(name = "计划调拨件数")
-    private Long fPlanqty;
+    private Integer fPlanqty;
 
     /**
      * 件数,由明细表自动合计生成
@@ -89,13 +90,13 @@ public class StockTransfer {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "调拨毛重（KG）")
-    private Float fGrossweight;
+    private BigDecimal fGrossweight;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "调拨净重（KG）")
-    private Float fNetweight;
+    private BigDecimal fNetweight;
 
 
     /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
@@ -108,7 +109,7 @@ public class StockTransfer {
     @Excel(name = "费用状态")
     private String fBillstatus;
 
-    
+
     public String getCreateBy() {
         return createBy;
     }
@@ -125,62 +126,62 @@ public class StockTransfer {
         this.fStorekeeper = fStorekeeper;
     }
 
-    
+
     public String getfCorpid() {
         return fCorpid;
     }
 
-    
+
     public void setfCorpid(String fCorpid) {
         this.fCorpid = fCorpid;
     }
 
-    
+
     public String getfMblno() {
         return fMblno;
     }
 
-    
+
     public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
 
-    
+
     public String getfProductName() {
         return fProductName;
     }
 
-    
+
     public void setfProductName(String fProductName) {
         this.fProductName = fProductName;
     }
 
-    
+
     public String getfMarks() {
         return fMarks;
     }
 
-    
+
     public void setfMarks(String fMarks) {
         this.fMarks = fMarks;
     }
 
-    
+
     public String getfBusinessType() {
         return fBusinessType;
     }
 
-    
+
     public void setfBusinessType(String fBusinessType) {
         this.fBusinessType = fBusinessType;
     }
 
-    
+
     public String getfBillstatus() {
         return fBillstatus;
     }
 
-    
+
     public void setfBillstatus(String fBillstatus) {
         this.fBillstatus = fBillstatus;
     }
@@ -209,11 +210,11 @@ public class StockTransfer {
         this.fWarehouseid = fWarehouseid;
     }
 
-    public Long getfPlanqty() {
+    public Integer getfPlanqty() {
         return fPlanqty;
     }
 
-    public void setfPlanqty(Long fPlanqty) {
+    public void setfPlanqty(Integer fPlanqty) {
         this.fPlanqty = fPlanqty;
     }
 
@@ -225,19 +226,19 @@ public class StockTransfer {
         this.fQty = fQty;
     }
 
-    public Float getfGrossweight() {
+    public BigDecimal getfGrossweight() {
         return fGrossweight;
     }
 
-    public void setfGrossweight(Float fGrossweight) {
+    public void setfGrossweight(BigDecimal fGrossweight) {
         this.fGrossweight = fGrossweight;
     }
 
-    public Float getfNetweight() {
+    public BigDecimal getfNetweight() {
         return fNetweight;
     }
 
-    public void setfNetweight(Float fNetweight) {
+    public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.finance.excel.FleetExcel;
 import com.ruoyi.shipping.domain.TAccount;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
+import com.ruoyi.warehouseBusiness.excel.QueryMenu;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

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

@@ -28,6 +28,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
 import com.ruoyi.common.utils.poi.DrawExcel;
 import com.ruoyi.common.utils.poi.ExcelUtils;
+import com.ruoyi.finance.domain.TFeeDo;
+import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.quotation.domain.TSeaprice;
 import com.ruoyi.quotation.mapper.TSeapriceMapper;
 import com.ruoyi.reportManagement.domain.TWareHouseItemsExcel;
@@ -102,6 +104,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     private TFeesMapper tFeesMapper;
 
     @Autowired
+    private TFeeDoMapper tFeeDoMapper;
+
+    @Autowired
     private TCntrMapper tCntrMapper;
 
     @Autowired
@@ -2969,6 +2974,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(warehouseBills.getfId())) {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
+
+        if (isCalculateFees(warehouseBills.getfId())) {
+            return AjaxResult.error("财务已计算费用");
+        }
         AjaxResult ajaxResult = this.changeFees(warehouseBills.getfId());
         String codeMessage = ajaxResult.get("code").toString();
         if ("500".equals(codeMessage)) {
@@ -5326,6 +5335,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult revokeTWarehousebillsById(Long fId, LoginUser loginUser, String billsType) {
+        if (isCalculateFees(fId)) {
+            return AjaxResult.error("财务已计算费用");
+        }
         // 查询 仓库主表信息、库存明细信息
         TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
         // 修改主表信息
@@ -6125,8 +6137,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     // 合计金额
                     cellValue = allAmount.toString();
                 } else if (j == size - 3) {
-                    // 收货公司名称
-                    cellValue = StringUtils.objToStr(map.get("fShippername"));
+                    // 订舱公司全称
+                    cellValue = StringUtils.objToStr(map.get("corpName"));
                 } else if (j == size - 2) {
                     // 收货公司全称
                     cellValue = StringUtils.objToStr(map.get("fConsigneername"));
@@ -7310,6 +7322,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
             throw new WarehouseException("未找到费用信息或费用已计算费用");
         }
+        if (isCalculateFees(warehousebillsfees.getfPid())) {
+            return AjaxResult.error("财务已计算费用");
+        }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.SAVE.getType()), new Date());
         TWarehouseBills warehouseBills = new TWarehouseBills();
         warehouseBills.setfId(warehousebillsfees.getfPid());
@@ -7746,6 +7761,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("找不到订单信息");
         }
+
+        if (isCalculateFees(warehouseBills.getfId())) {
+            return AjaxResult.error("财务已计算费用");
+        }
         AjaxResult ajaxResult = this.changeFees(warehouseBills.getfId());
         String code = ajaxResult.get("code").toString();
         if ("500".equals(code)) {
@@ -8041,6 +8060,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    private boolean isCalculateFees(Long id) {
+        TFeeDo feeDo = new TFeeDo();
+        feeDo.setfSrcpid(id);
+        List<TFeeDo> tFeeDoList = tFeeDoMapper.selectTFeeDoList(feeDo);
+        return tFeeDoList.size() > 0;
+    }
+
     /**
      * 出入库、库存统计
      *

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

@@ -421,6 +421,8 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
         modifyVO.setfGoodsid(warehouseBills.getfProductName());
         modifyVO.setfBilltype(warehouseBills.getfBilltype());
         modifyVO.setfWarehouseid(warehouseBills.getfWarehouseid());
+        modifyVO.setfVslid(warehouseBills.getfVslid());
+        modifyVO.setfVoyid(warehouseBills.getfVoyid());
         // 转化客户、商品、仓库名称
         TCorps tCorps = corpsMapper.selectTCorpsById(modifyVO.getfCorpid());
         if (Objects.nonNull(tCorps)) {

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

@@ -2791,7 +2791,7 @@
                     td.f_name AS portOfDeparture, /*始发港*/
                     ts.f_name AS destinationPort, /*目的港*/
                     tg.f_name AS goodName, /*货名*/
-                    sd.dict_label AS transitClause, /*运输条款*/
+                    concat_ws('-', sd.dict_label, tk.dict_label) AS transitClause, /*运输条款*/
                     tc.f_name AS bookingCompany, /*订舱公司*/
                     tw.f_consigneername AS fConsigneername, /*收货公司名称*/
                     tw.f_consigneeattn AS fConsigneeattn, /*收货公司地址*/
@@ -2808,6 +2808,7 @@
                         LEFT JOIN t_address ts ON ts.f_id = tw.f_destportid
                         LEFT JOIN t_goods tg ON tg.f_id = tcr.f_goodsid
                         LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems AND sd.dict_type = 'f_serviceitems'
+                        LEFT JOIN sys_dict_data tk ON tk.dict_value = tw.f_serviceitems_new AND tk.dict_type = 'f_serviceitems'
                 <where>
                     tw.f_typeid = '1'
                     and tw.del_flag = '0'
@@ -2855,12 +2856,14 @@
                     tc.f_name goodsName,
                     date_format(ty.f_ETD, '%Y-%m-%d') fEtd,
                     date_format(ty.f_ETA, '%Y-%m-%d') fEta,
+                    tcp.f_name corpName,
                     tw.f_shippername fShippername,
                     tw.f_consigneername fConsigneername,
                     tw.f_consigneeattn fConsigneeattn,
                     tw.f_consigneetel fConsigneetel
                 FROM
                     t_warehousebills tw
+                        LEFT JOIN t_corps tcp ON tcp.f_id = tw.f_corpid
                         LEFT JOIN t_address tre ON tre.f_id = tw.f_loadportid
                         LEFT JOIN t_address ts ON ts.f_id = tw.f_destportid
                         LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems AND sd.dict_type = 'f_serviceitems'

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehousebillsModifyMapper">
-    
+
     <resultMap type="TWarehousebillsModify" id="TWarehousebillsModifyResult">
         <result property="fId"    column="f_id"    />
         <result property="fPid"    column="f_pid"    />
@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fGoodsid"    column="f_goodsid"    />
         <result property="fMarks"    column="f_marks"    />
         <result property="fWarehouseid"    column="f_warehouseid"    />
+        <result property="fVslid"    column="f_vslid"    />
+        <result property="fVoyid"    column="f_voyid"    />
         <result property="fBstime"    column="f_bstime"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -26,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTWarehousebillsModifyVo">
-        select f_id, f_pid, f_billno, f_dc, f_corpid, f_billtype, f_mblno, f_goodsid, f_marks, f_warehouseid, f_bstime, del_flag, f_status, create_by, create_time, update_by, update_time, remark from t_warehousebills_modify
+        select f_id, f_pid, f_billno, f_dc, f_corpid, f_billtype, f_mblno, f_goodsid, f_marks, f_warehouseid, f_vslid, f_voyid, f_bstime, del_flag, f_status, create_by, create_time, update_by, update_time, remark from t_warehousebills_modify
     </sql>
 
     <select id="selectTWarehousebillsModifyList" parameterType="TWarehousebillsModify" resultMap="TWarehousebillsModifyResult">
         <include refid="selectTWarehousebillsModifyVo"/>
-        <where>  
+        <where>
             <if test="fBillno != null  and fBillno != ''"> and f_billno = #{fBillno}</if>
             <if test="fDc != null  and fDc != ''"> and f_dc = #{fDc}</if>
             <if test="fCorpid != null "> and f_corpid = #{fCorpid}</if>
@@ -40,13 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fGoodsid != null "> and f_goodsid = #{fGoodsid}</if>
             <if test="fMarks != null  and fMarks != ''"> and f_marks = #{fMarks}</if>
             <if test="fWarehouseid != null "> and f_warehouseid = #{fWarehouseid}</if>
+            <if test="fVslid != null "> and f_vslid = #{fVslid}</if>
+            <if test="fVoyid != null "> and f_voyid = #{fVoyid}</if>
             <if test="fStatus != null "> and f_status = #{fStatus}</if>
             <if test="bstimeList != null and bstimeList[0] != null and bstimeList[0] != ''"> and f_bstime BETWEEN #{bstimeList[0]} and #{bstimeList[1]}</if>
             <if test="createTimeList != null and createTimeList[0] != null and createTimeList[0] != ''"> and create_time BETWEEN #{createTimeList[0]} and #{createTimeList[1]}</if>
         </where>
         order by f_id desc
     </select>
-    
+
     <select id="selectTWarehousebillsModifyById" parameterType="Long" resultMap="TWarehousebillsModifyResult">
         <include refid="selectTWarehousebillsModifyVo"/>
         where f_id = #{fId}
@@ -71,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fGoodsid != null">f_goodsid,</if>
             <if test="fMarks != null">f_marks,</if>
             <if test="fWarehouseid != null">f_warehouseid,</if>
+            <if test="fVslid != null">f_vslid,</if>
+            <if test="fVoyid != null">f_voyid,</if>
             <if test="fBstime != null">f_bstime,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -90,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fGoodsid != null">#{fGoodsid},</if>
             <if test="fMarks != null">#{fMarks},</if>
             <if test="fWarehouseid != null">#{fWarehouseid},</if>
+            <if test="fVslid != null">#{fVslid},</if>
+            <if test="fVoyid != null">#{fVoyid},</if>
             <if test="fBstime != null">#{fBstime},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -113,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
             <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
+            <if test="fVslid != null">f_vslid = #{fVslid},</if>
+            <if test="fVoyid != null">f_voyid = #{fVoyid},</if>
             <if test="fBstime != null">f_bstime = #{fBstime},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -130,10 +140,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTWarehousebillsModifyByIds" parameterType="String">
-        delete from t_warehousebills_modify where f_id in 
+        delete from t_warehousebills_modify where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>