凯和修改

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

@@ -59,7 +59,7 @@ public class TVesselController extends BaseController
     {
         List<TVessel> list = tVesselService.selectTVesselList(tVessel);
         ExcelUtil<TVessel> util = new ExcelUtil<TVessel>(TVessel.class);
-        return util.exportExcel(list, "vessel");
+        return util.exportExcel(list, "船信息");
     }
 
     /**

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.shipping.service.ITAddressService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,8 @@ public class TVoyageController extends BaseController
 {
     @Autowired
     private ITVoyageService tVoyageService;
+    @Autowired
+    private ITAddressService itAddressService;
 
     /**
      * 查询航次列表
@@ -52,7 +55,7 @@ public class TVoyageController extends BaseController
     {
         List<TVoyage> list = tVoyageService.selectTVoyageList(tVoyage);
         ExcelUtil<TVoyage> util = new ExcelUtil<TVoyage>(TVoyage.class);
-        return util.exportExcel(list, "voyage");
+        return util.exportExcel(list, "航次信息");
     }
 
     /**

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

@@ -151,7 +151,7 @@ public class FinancialCharges 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/shipping/finance/FinancialController.java

@@ -159,7 +159,7 @@ public class FinancialController  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/shipping/finance/FinancialPay.java

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

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TVessel.java

@@ -64,7 +64,7 @@ public class TVessel extends BaseEntity
     private Long fWeight;
 
     /** 默认 T ,正常T 停用F 下拉选择 */
-    @Excel(name = "默认 T ,正常T 停用F 下拉选择")
+    @Excel(name = "默认 T ,正常T 停用F")
     private String fStatus;
     //查询时间区间
     private List<String> cLoadDate;

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TVoyage.java

@@ -23,29 +23,36 @@ public class TVoyage extends BaseEntity
     private Long fId;
 
     /** 船名id（t_vessel  f_id） */
-    @Excel(name = "船名id", readConverterExp = "t=_vessel,f=_id")
     private Long fPid;
     /**船名中文*/
+    @Excel(name = "船名")
     private String pidName;
 
     /** 航次 */
     @Excel(name = "航次")
     private String fNo;
-
-    /** 装货港 */
+    //装货港名称
     @Excel(name = "装货港")
+    private String portofloadidName;
+    //卸货港名称
+    @Excel(name = "卸货港")
+    private String portofdischargeidName;
+    //目的港名称
+    @Excel(name = "目的港")
+    private String distinationidName;
+    //中转港名称
+    @Excel(name = "中转港")
+    private String portoftransshipmentName;
+    /** 装货港 */
     private Long fPortofloadid;
 
     /** 卸货港 */
-    @Excel(name = "卸货港")
     private Long fPortofdischargeid;
 
     /** 目的港 */
-    @Excel(name = "目的港")
     private Long fDistinationid;
 
     /** 中转港 */
-    @Excel(name = "中转港")
     private Long fPortoftransshipment;
 
     /** 预计开船日期 */
@@ -85,9 +92,10 @@ public class TVoyage extends BaseEntity
     /** $column.columnComment */
     @Excel(name = "截港日期")
     private String fTeu;
-
-    /** 管船人 */
+    //管船人名称
     @Excel(name = "管船人")
+    private String manageidName;
+    /** 管船人 */
     private Long fManageid;
 
     /** 电话 */
@@ -95,23 +103,15 @@ public class TVoyage extends BaseEntity
     private String fTel;
 
     /** 默认 T ,正常T 停用F 下拉选择 */
-    @Excel(name = "默认 T ,正常T 停用F 下拉选择")
+    @Excel(name = "状态")
     private String fStatus;
     /** 航线 */
-    @Excel(name = "航线")
     private Integer fLaneid;
+    //航线名称
+    @Excel(name = "航线")
+    private String fLaneName;
     //查询时间区间
     private List<String> cLoadDate;
-    //装货港名称
-    private String portofloadidName;
-    //卸货港名称
-    private String portofdischargeidName;
-    //目的港名称
-    private String distinationidName;
-    //中转港名称
-    private String portoftransshipmentName;
-    //管船人名称
-    private String manageidName;
     //最低运费
     private String twenty;
     //最低运费
@@ -124,8 +124,6 @@ public class TVoyage extends BaseEntity
     private List<TVoyage> freight;
     //中转港是否为空
     private Long empty;
-    //航线名称
-    private String fLaneName;
     //运价信息
     private List<TCtnpriceItems> tCtnpriceItemsList;
 

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

@@ -1321,7 +1321,7 @@ public class TFeeServiceImpl implements ITFeeService {
                     tWarehouseBills.setfCaregoStatus("2");
                 }else if (warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) > 0){
                     tWarehouseBills.setfCaregoStatus("1");
-                }else if (warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) == 0){
+                }else if (warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) <= 0){
                     tWarehouseBills.setfCaregoStatus("2");
                 }
                 tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);

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

@@ -1144,7 +1144,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }else if (CollectionUtils.isNotEmpty(fd) && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0){
             warehouseBills.setfCaregoStatus("1");
         }else{
-            warehouseBills.setfCaregoStatus("0");
+            warehouseBills.setfCaregoStatus("1");
         }
         tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         map.put("warehouseBills", warehouseBills);
@@ -2977,7 +2977,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehousebills.setfCaregoStatus("2");
         }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
             warehousebills.setfCaregoStatus("1");
-        }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) == 0){
+        }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) <= 0){
             warehousebills.setfCaregoStatus("2");
         }
         tWarehouseBillsMapper.updateTWarehousebills(warehousebills);
@@ -7151,6 +7151,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     tWarehousebillsfees.setfAmount(new BigDecimal(number).multiply(tWarehousebillsfees.getfUnitprice()));
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(tWarehousebillsfees);
                 }
+                //应收费用
+                List<TWarehousebillsfees> fd =  tWarehousebillsfeesMapper.selectFeesByPId(warehouseBills.getfId(), "D");
+                //应付费用
+                List<TWarehousebillsfees> fc = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBills.getfId(), "C");
+                //查询订单最新信息
+                TWarehouseBills warehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
+                //获取订舱单位
+                TCorps tCorps = tCorpsMapper.selectTCorpsById(warehousebills.getfCorpid());
+                warehousebills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+                warehousebills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+                if (tCorps == null || (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3"))){
+                    warehousebills.setfCaregoStatus("2");
+                }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
+                    warehousebills.setfCaregoStatus("1");
+                }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) <= 0){
+                    warehousebills.setfCaregoStatus("2");
+                }
+                tWarehouseBillsMapper.updateTWarehousebills(warehousebills);
             }
         } else {
             TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
@@ -7200,6 +7218,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(tWarehousebillsfees);
                 }
             }
+            //应收费用
+            List<TWarehousebillsfees> fd =  tWarehousebillsfeesMapper.selectFeesByPId(warehouseBills.getfId(), "D");
+            //应付费用
+            List<TWarehousebillsfees> fc = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBills.getfId(), "C");
+            //查询订单最新信息
+            TWarehouseBills warehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
+            //获取订舱单位
+            TCorps tCorps = tCorpsMapper.selectTCorpsById(warehousebills.getfCorpid());
+            warehousebills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            warehousebills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            if (tCorps == null || (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3"))){
+                warehousebills.setfCaregoStatus("2");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
+                warehousebills.setfCaregoStatus("1");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) <= 0){
+                warehousebills.setfCaregoStatus("2");
+            }
+            tWarehouseBillsMapper.updateTWarehousebills(warehousebills);
         }
         if (isApprove) {
             AuditItems auditItems = new AuditItems();
@@ -7301,6 +7337,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsfees.setfAmount(tWarehousebillsfees.getfQty().multiply(tWarehousebillsfees.getfUnitprice()));
                 tWarehousebillsfeesMapper.updateTWarehousebillsfees(tWarehousebillsfees);
             }
+            //应收费用
+            List<TWarehousebillsfees> fd =  tWarehousebillsfeesMapper.selectFeesByPId(selectOne.getfId(), "D");
+            //应付费用
+            List<TWarehousebillsfees> fc = tWarehousebillsfeesMapper.selectFeesByPId(selectOne.getfId(), "C");
+            //查询订单最新信息
+            TWarehouseBills warehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(selectOne.getfId());
+            //获取订舱单位
+            TCorps tCorps = tCorpsMapper.selectTCorpsById(selectOne.getfCorpid());
+            warehousebills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            warehousebills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            if (tCorps == null || (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3"))){
+                warehousebills.setfCaregoStatus("2");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
+                warehousebills.setfCaregoStatus("1");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) <= 0){
+                warehousebills.setfCaregoStatus("2");
+            }
+            tWarehouseBillsMapper.updateTWarehousebills(warehousebills);
         }
         //修改原单箱信息
         List<TWarehousebillsCntritems> tWarehousebillsCntritemsList = tWarehousebillsCntritemsMapper.selectTWarehousebillsCntritemsByPId(orderId);
@@ -8307,7 +8361,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     tWarehouseBills.setfCaregoStatus("2");
                 }else if (!warehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) > 0){
                     tWarehouseBills.setfCaregoStatus("1");
-                }else if (!warehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) == 0){
+                }else if (!warehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) <= 0){
                     tWarehouseBills.setfCaregoStatus("2");
                 }
                 tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);

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

@@ -310,6 +310,26 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
             }
             tWarehousebillsfeesModifyMapper.updateTWarehousebillsfeesModify(li);
         });
+        if (CollectionUtils.isNotEmpty(feesList)){
+            //应收费用
+            List<TWarehousebillsfees> fd =  warehousebillsfeesMapper.selectFeesByPId(warehousebillsModify.getfPid(), "D");
+            //应付费用
+            List<TWarehousebillsfees> fc = warehousebillsfeesMapper.selectFeesByPId(warehousebillsModify.getfPid(), "C");
+            //查询订单最新信息
+            TWarehouseBills warehousebills = warehousebillsmapper.selectTWarehousebillsById(warehousebillsModify.getfPid());
+            //获取订舱单位
+            TCorps tCorps = corpsMapper.selectTCorpsById(warehousebills.getfCorpid());
+            warehousebills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            warehousebills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
+            if (tCorps == null || (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3"))){
+                warehousebills.setfCaregoStatus("2");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
+                warehousebills.setfCaregoStatus("1");
+            }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) <= 0){
+                warehousebills.setfCaregoStatus("2");
+            }
+            warehousebillsmapper.updateTWarehousebills(warehousebills);
+        }
     }
 
     /**