Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogistics.java

@@ -95,6 +95,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "actual_price")
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    @TableField(value = "deduct_price")
+    private BigDecimal deductPrice;
 
     /**
      * 审核人联系方式（托运方）

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTrade.java

@@ -96,6 +96,12 @@ public class KwpLedgerTrade {
     @TableField(value = "actual_price")
     private BigDecimal actualPrice;
 
+    /**
+     * 扣款金额
+     */
+    @TableField(value = "deduct_price")
+    private BigDecimal deductPrice;
+
     /**
      * 审核人联系方式（采购方）
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerCarrierDto.java

@@ -93,6 +93,11 @@ public class LedgerCarrierDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
     /**
      * 对账审核人电话
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerLogisticsDto.java

@@ -107,6 +107,9 @@ public class LedgerLogisticsDto implements ILedger {
      */
     private BigDecimal actualPrice;
 
+    private BigDecimal deductPrice;
+
+
     /**
      * 对账清单凭证
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerPurchaseDto.java

@@ -76,6 +76,10 @@ public class LedgerPurchaseDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账完成人电话(销售方)

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerSellDto.java

@@ -77,6 +77,11 @@ public class LedgerSellDto implements ILedger {
      */
     private BigDecimal actualPrice;
 
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
+
     /**
      * 对账审核人电话
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerShipperDto.java

@@ -75,6 +75,10 @@ public class LedgerShipperDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
     /**
      * 对账审核人电话（承运方）
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerTradeDto.java

@@ -75,6 +75,10 @@ public class LedgerTradeDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账采购财务联系人电话

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/LedgerLogistics.java

@@ -97,6 +97,10 @@ public class LedgerLogistics implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账清单凭证

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/LedgerSell.java

@@ -77,6 +77,10 @@ public class LedgerSell implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账采购财务联系人名称

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsSendReq.java

@@ -68,9 +68,11 @@ public class LogisticsSendReq implements IdsList {
     @PositiveOrZero(message = "总应收必须大于等于0")
     private BigDecimal totalPrice;
     /**
-     * 已收款/元
+     * 扣款金额
      */
-    private BigDecimal actualPrice;
+    @NotNull(message = "扣款金额不能为空")
+    @PositiveOrZero(message = "扣款金额必须大于等于0")
+    private BigDecimal deductPrice;
     /**
      * 备注
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeSendReq.java

@@ -71,6 +71,12 @@ public class TradeSendReq implements IdsList {
     @NotNull(message = "总应收不能为空")
     @PositiveOrZero(message = "总应收必须大于等于0")
     private BigDecimal totalPrice;
+    /**
+     * 扣款金额
+     */
+    @NotNull(message = "扣款金额不能为空")
+    @PositiveOrZero(message = "扣款金额必须大于等于0")
+    private BigDecimal deductPrice;
 
     /**
      * 备注

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerLogisticsVo.java

@@ -79,7 +79,11 @@ public class LedgerLogisticsVo {
      */
     @ExcelProperty(value = "已收款/元")
     private BigDecimal actualPrice;
-
+    /**
+     * 扣款金额
+     */
+    @ExcelProperty(value = "扣款金额")
+    private BigDecimal deductPrice;
     /**
      * 财务联系人
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerTradeVo.java

@@ -84,6 +84,11 @@ public class LedgerTradeVo {
      */
     @ExcelProperty(value = "已收款/元")
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    @ExcelProperty(value = "扣款金额")
+    private BigDecimal deductPrice;
 
     /**
      * 客户联系人

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -252,6 +252,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());
         kwpLedgerLogistics.setSettlePrice(logisticsSendReq.getSettlePrice());
         kwpLedgerLogistics.setActualPrice(new BigDecimal("0.0"));
+        kwpLedgerLogistics.setDeductPrice(logisticsSendReq.getDeductPrice());
         kwpLedgerLogistics.setAuditUser(Global.EMPTY_STRING);
         kwpLedgerLogistics.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerLogistics.setReceiptTime(null);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -219,6 +219,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());
         kwpLedgerTrade.setSettlePrice(tradeSendReq.getSettlePrice());
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
+        kwpLedgerTrade.setDeductPrice(tradeSendReq.getDeductPrice());
         kwpLedgerTrade.setAuditUser(Global.EMPTY_STRING);
         kwpLedgerTrade.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerLogisticsMapper.xml

@@ -16,6 +16,7 @@
         <result column="ex_tax_price" jdbcType="DECIMAL" property="exTaxPrice"/>
         <result column="settle_price" jdbcType="DECIMAL" property="settlePrice"/>
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
+        <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
@@ -46,6 +47,7 @@
         ex_tax_price,
         settle_price,
         actual_price,
+        deduct_price,
         audit_user,
         audit_phone,
         success_user,
@@ -74,6 +76,7 @@
         kll.ex_tax_price  exTaxPrice,
         kll.settle_price  settlePrice,
         kll.actual_price  actualPrice,
+        kll.deduct_price  deductPrice,
         kll.audit_phone   auditPhone,
         kll.audit_user    auditUser,
         kll.success_phone successPhone,
@@ -102,6 +105,7 @@
                kll.ex_tax_price  exTaxPrice,
                kll.settle_price  settlePrice,
                kll.actual_price  actualPrice,
+               kll.deduct_price  deductPrice,
                kll.success_phone successPhone,
                kll.success_user  successUser,
                kll.url,
@@ -189,8 +193,9 @@
                kll.ex_tax_price  AS exTaxPrice,
                kll.settle_price  AS settlePrice,
                kll.actual_price  AS actualPrice,
-               kll.audit_phone      auditPhone,
-               kll.audit_user       auditUser,
+               kll.deduct_price  AS deductPrice,
+               kll.audit_phone   AS auditPhone,
+               kll.audit_user    AS auditUser,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -246,6 +251,7 @@
                kll.ex_tax_price  AS exTaxPrice,
                kll.settle_price  AS settlePrice,
                kll.actual_price  AS actualPrice,
+               kll.deduct_price  AS deductPrice,
                kll.audit_phone      auditPhone,
                kll.audit_user       auditUser,
                kll.success_phone AS successPhone,
@@ -685,6 +691,7 @@
                kll.ex_tax_price                    exTaxPrice,
                kll.settle_price                    settlePrice,
                kll.actual_price                    actualPrice,
+               kll.deduct_price                 AS deductPrice,
                kll.url,
                kll.generate_time                   generateTime,
                kll.receipt_time                    receiptTime,

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeMapper.xml

@@ -16,6 +16,7 @@
         <result column="ex_tax_price" jdbcType="DECIMAL" property="exTaxPrice"/>
         <result column="settle_price" jdbcType="DECIMAL" property="settlePrice"/>
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
+        <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
@@ -46,6 +47,7 @@
         ex_tax_price,
         settle_price,
         actual_price,
+        deduct_price,
         audit_user,
         audit_phone,
         success_user,
@@ -74,6 +76,7 @@
         klt.ex_tax_price  exTaxPrice,
         klt.settle_price  settlePrice,
         klt.actual_price  actualPrice,
+        klt.deduct_price  deductPrice,
         klt.audit_phone   auditPhone,
         klt.audit_user    auditUser,
         klt.url,
@@ -99,6 +102,7 @@
         klt.ex_tax_price  exTaxPrice,
         klt.settle_price  settlePrice,
         klt.actual_price  actualPrice,
+        klt.deduct_price  deductPrice,
         klt.success_phone successPhone,
         klt.success_user  successUser,
         klt.url,
@@ -186,6 +190,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -251,6 +256,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -668,6 +674,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.url,
@@ -703,6 +710,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.url,
@@ -738,6 +746,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -806,6 +815,7 @@
                klt.ex_tax_price                    exTaxPrice,
                klt.settle_price                    settlePrice,
                klt.actual_price                    actualPrice,
+               klt.deduct_price                    deductPrice,
                klt.url,
                klt.generate_time                   generateTime,
                klt.receipt_time                    receiptTime,

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddOrderDTO.java

@@ -213,7 +213,7 @@ public class AddOrderDTO {
      */
     @NotNull(message = "支付方式不能为空")
     @Min(value = 0, message = "支付方式必须大于等于{value}")
-    @Max(value = 4, message = "支付方式必须小于等于{value}")
+//    @Max(value = 4, message = "支付方式必须小于等于{value}")
     private Long payment;
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/ManagementLogisticsOrderExcelVo.java

@@ -21,219 +21,244 @@ import java.time.LocalDate;
 //        @Translate(field = "status")
 //})
 public class ManagementLogisticsOrderExcelVo implements Serializable {
+
     /**
-     * 结算周期
+     * 状态
      */
-    @ExcelProperty(value = "结算周期")
-    private String accountsCycleLabel;
+    @ExcelProperty(value = "状态")
+    private String statusLabel;
 
     /**
-     * 发起人
+     * 贸易订单编号
      */
-    @ExcelProperty(value = "发起人")
-    private String appointor;
+    @JsonProperty("tOrderNo")
+    @ExcelProperty(value = "贸易订单编号")
+    private String tOrderNo;
 
     /**
-     * 计费方式
+     * 承运订单号
      */
-    @ExcelProperty(value = "计费方式")
-    private String billingModeLabel;
+    @JsonProperty("lOrderNo")
+    @ExcelProperty(value = "托运订单号")
+    private String lOrderNo;
+
+    /**
+     * 订单来源
+     */
+    @ExcelProperty(value = "订单来源")
+    private String orderSourceLabel;
+
+    /**
+     * 托运单位
+     */
+    @ExcelProperty(value = "托运单位")
+    private String consignCompany;
 
     /**
      * 承运单位
      */
     @ExcelProperty(value = "承运单位")
     private String carrierCompany;
+
     /**
-     * 承运联系人
-     */
-    @ExcelProperty(value = "承运联系人")
-    private String carrierContacts;
-    /**
-     * 承运联系电话
+     * 货物名称
      */
-    @ExcelProperty(value = "承运联系电话")
-    private String carrierPhone;
+    @ExcelProperty(value = "货物名称")
+    private String goodsName;
+
     /**
-     * 分配承运量
+     * 任务总量
      */
-    @ExcelProperty(value = "承运量")
+    @ExcelProperty(value = "任务总量")
     private BigDecimal carryingCapacity;
 
     /**
-     * 托运单位
+     * 待分配量(amount-subcontract_amount-entrust_amount)
      */
-    @ExcelProperty(value = "托运单位")
-    private String consignCompany;
+    @ExcelProperty(value = "待分配量")
+    private String waitDistributionAmount;
+
     /**
-     * 托运联系人
+     * 装货量-实装量
      */
-    @ExcelProperty(value = "托运联系人")
-    private String consignContacts;
+    @ExcelProperty(value = "实装量")
+    private String loadAmount;
+
     /**
-     * 托运联系电话
+     * 卸货量
      */
-    @ExcelProperty(value = "托运联系电话")
-    private String consignPhone;
+    @ExcelProperty(value = "实卸量")
+    private String unloadAmount;
+
     /**
-     * 合同
+     * 运价
      */
-    @ExcelProperty(value = "合同")
-    private String contract;
+    @ExcelProperty(value = "运价")
+    private String priceLabel;
 
     /**
-     * 扣亏货值/元/吨
+     * 税率
      */
-    @ExcelProperty(value = "扣亏货值")
-    private BigDecimal deficitAmount;
+    @ExcelProperty(value = "税率/%")
+    private BigDecimal taxRate;
+
     /**
-     * 货物名称
+     * 装货地点名称
      */
-    @ExcelProperty(value = "货物名称")
-    private String goodsName;
+    @ExcelProperty(value = "装货地点名称")
+    private String loadName;
+
     /**
-     * 装货地点
+     * 地址明细
      */
-    @ExcelProperty(value = "装货地点")
+    @ExcelProperty(value = "地址明细")
     private String loadAddress;
 
     /**
-     * 承运订单号
+     * 卸货地点名称
      */
-    @JsonProperty("lOrderNo")
-    @ExcelProperty(value = "托运订单号")
-    private String lOrderNo;
+    @ExcelProperty(value = "卸货地点名称")
+    private String unloadName;
 
     /**
-     * 贸易订单编号
+     * 地址明细
      */
-    @JsonProperty("tOrderNo")
-    @ExcelProperty(value = "贸易订单编号")
-    private String tOrderNo;
+    @ExcelProperty(value = "地址明细")
+    private String unloadAddress;
 
     /**
-     * 合理损耗单位
+     * 发货单位
      */
-    @ExcelProperty(value = "合理损耗")
-    private String lossUnitLabel;
+    @ExcelProperty(value = "发货单位")
+    private String shipmentsUnit;
 
     /**
-     * 运价
+     * 收货单位
      */
-    @ExcelProperty(value = "运价")
-    private String priceLabel;
+    @ExcelProperty(value = "收货单位")
+    private String receiveGoodsUnit;
 
     /**
-     * 税率
+     * 计费方式
      */
-    @ExcelProperty(value = "税率")
-    private BigDecimal taxRate;
+    @ExcelProperty(value = "计费方式")
+    private String billingModeLabel;
 
+    /**
+     * 合理损耗单位
+     */
+    @ExcelProperty(value = "合理损耗")
+    private String lossUnitLabel;
 
     /**
-     * 订单来源
+     * 扣亏货值/元/吨
      */
-    @ExcelProperty(value = "订单来源")
-    private String orderSourceLabel;
+    @ExcelProperty(value = "扣亏货值/元/吨")
+    private BigDecimal deficitAmount;
 
     /**
-     * 收货联系人
+     * 结算周期
      */
-    @ExcelProperty(value = "收货联系人")
-    private String receiveGoodsContacts;
+    @ExcelProperty(value = "结算周期")
+    private String accountsCycleLabel;
 
     /**
-     * 计划收货时间
+     * 承运联系人
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ExcelProperty(value = "计划收货时间")
-    private LocalDate receiveGoodsDateTime;
+    @ExcelProperty(value = "承运联系人")
+    private String carrierContacts;
 
     /**
-     * 收货电话
+     * 承运联系电话
      */
-    @ExcelProperty(value = "收货电话")
-    private String receiveGoodsPhone;
+    @ExcelProperty(value = "承运联系电话")
+    private String carrierPhone;
 
     /**
-     * 备注
+     * 托运联系人
      */
-    @ExcelProperty(value = "备注")
-    private String remark;
+    @ExcelProperty(value = "托运联系人")
+    private String consignContacts;
 
     /**
-     * 发货联系人
+     * 托运联系电话
      */
-    @ExcelProperty(value = "发货联系人")
-    private String shipmentsContacts;
+    @ExcelProperty(value = "托运联系电话")
+    private String consignPhone;
 
     /**
-     * 计划发货时间
+     * 装货点联系人
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ExcelProperty(value = "计划发货时间")
-    private LocalDate shipmentsDateTime;
+    @ExcelProperty(value = "装货点联系人")
+    private String shipmentsContacts;
 
     /**
-     * 发货电话
+     * 联系电话
      */
-    @ExcelProperty(value = "发货电话")
+    @ExcelProperty(value = "联系电话")
     private String shipmentsPhone;
 
     /**
-     * 签约方式
+     * 卸货点联系人
      */
-    @ExcelProperty(value = "签约方式")
-    private String signingLabel;
+    @ExcelProperty(value = "卸货点联系人")
+    private String receiveGoodsContacts;
 
     /**
-     * 状态
+     * 联系电话
      */
-    @ExcelProperty(value = "状态")
-    private String statusLabel;
+    @ExcelProperty(value = "联系电话")
+    private String receiveGoodsPhone;
 
     /**
-     * 卸货地点
+     * 计划开始时间
      */
-    @ExcelProperty(value = "卸货地点")
-    private String unloadAddress;
-
-    @ExcelProperty(value = "创建时间")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelProperty(value = "计划开始时间")
+    private LocalDate shipmentsDateTime;
 
-    @ExcelProperty(value = "修改时间")
-    private String updateTime;
+    /**
+     * 计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelProperty(value = "计划结束时间")
+    private LocalDate receiveGoodsDateTime;
 
     /**
-     * 发货单位
+     * 关联合同
      */
-    @ExcelProperty(value = "发货单位")
-    private String shipmentsUnit;
+    @ExcelProperty(value = "关联合同")
+    private String contract;
 
     /**
-     * 收货单位
+     * 创建人
      */
-    @ExcelProperty(value = "收货单位")
-    private String receiveGoodsUnit;
+    @ExcelProperty(value = "创建人")
+    private String appointor;
+
+    @ExcelProperty(value = "创建时间")
+    private String createTime;
 
     /**
-     * 商品价值（扣亏货值）
+     * 备注
      */
-    @ExcelProperty(value = "扣亏货值")
-    private String goodsPriceLabel;
+    @ExcelProperty(value = "备注")
+    private String remark;
 
     /**
-     * 装货量
+     * 签约方式
      */
-    @ExcelProperty(value = "装货量")
-    private String loadAmount;
+    @ExcelProperty(value = "签约方式")
+    private String signingLabel;
 
+    @ExcelProperty(value = "修改时间")
+    private String updateTime;
 
     /**
-     * 待分配量(amount-subcontract_amount-entrust_amount)
+     * 商品价值（扣亏货值）
      */
-    @ExcelProperty(value = "待分配量")
-    private String waitDistributionAmount;
+    @ExcelProperty(value = "扣亏货值")
+    private String goodsPriceLabel;
 
     /**
      * 分包量（给下游承运商分包的量）
@@ -247,178 +272,4 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "已委托量")
     private String entrustAmount;
 
-    /**
-     * 卸货量
-     */
-    @ExcelProperty(value = "卸货量")
-    private String unloadAmount;
-
-
-
-//    /**
-//     * 结算周期
-//     */
-//    @ExcelProperty(value = "结算周期")
-//    private String accountsCycle;
-//    /**
-//     * 发起人
-//     */
-//    @ExcelProperty(value = "发起人")
-//    private String appointor;
-//    /**
-//     * 计费方式
-//     */
-//    @ExcelProperty(value = "计费方式")
-//    private String billingMode;
-//    /**
-//     * 承运单位
-//     */
-//    @ExcelProperty(value = "承运单位")
-//    private String carrierCompany;
-//    /**
-//     * 承运联系人
-//     */
-//    @ExcelProperty(value = "承运联系人")
-//    private String carrierContacts;
-//    /**
-//     * 承运订单
-//     */
-//    @ExcelProperty(value = "承运订单")
-//    private String carrierOrder;
-//    /**
-//     * 承运联系电话
-//     */
-//    @ExcelProperty(value = "承运联系电话")
-//    private String carrierPhone;
-//    /**
-//     * 分配承运量
-//     */
-//    @ExcelProperty(value = "分配承运量")
-//    private String carryingCapacity;
-//    /**
-//     * 托运单位
-//     */
-//    @ExcelProperty(value = "托运单位")
-//    private String consignCompany;
-//    /**
-//     * 托运联系人
-//     */
-//    @ExcelProperty(value = "托运联系人")
-//    private String consignContacts;
-//    /**
-//     * 托运联系电话
-//     */
-//    @ExcelProperty(value = "托运联系电话")
-//    private String consignPhone;
-//    /**
-//     * 合同
-//     */
-//    @ExcelProperty(value = "合同")
-//    private String contract;
-//    /**
-//     * 扣亏货值/元/吨
-//     */
-//    @ExcelProperty(value = "扣亏货值/元/吨")
-//    private String deficitAmount;
-//    /**
-//     * 货物名称
-//     */
-//    @ExcelProperty(value = "货物名称")
-//    private String goodsName;
-//    /**
-//     * 装货地点
-//     */
-//    @ExcelProperty(value = "装货地点")
-//    private String loadAddress;
-//    /**
-//     * 数据库id
-//     */
-//    private String lOrderId;
-//    /**
-//     * 托运订单号
-//     */
-//    @ExcelProperty(value = "托运订单号")
-//    private String lOrderNo;
-//    /**
-//     * 合理损耗
-//     */
-//    @ExcelProperty(value = "合理损耗")
-//    private String loss;
-//    /**
-//     * 计划时间
-//     */
-//    @ExcelProperty(value = "计划时间")
-//    private String plannedDateTime;
-//    /**
-//     * 运价
-//     */
-//    @ExcelProperty(value = "运价")
-//    private String price;
-//    /**
-//     * 收货联系人
-//     */
-//    @ExcelProperty(value = "收货联系人")
-//    private String receiveGoodsContacts;
-//    /**
-//     * 计划收货时间
-//     */
-//    @ExcelProperty(value = "计划收货时间")
-//    private String receiveGoodsDateTime;
-//    /**
-//     * 收货电话
-//     */
-//    @ExcelProperty(value = "收货电话")
-//    private String receiveGoodsPhone;
-//    /**
-//     * 备注
-//     */
-//    @ExcelProperty(value = "备注")
-//    private String remark;
-//    /**
-//     * 发货联系人
-//     */
-//    @ExcelProperty(value = "发货联系人")
-//    private String shipmentsContacts;
-//    /**
-//     * 计划发货时间
-//     */
-//    @ExcelProperty(value = "计划发货时间")
-//    private String shipmentsDateTime;
-//    /**
-//     * 发货电话
-//     */
-//    @ExcelProperty(value = "发货电话")
-//    private String shipmentsPhone;
-//    /**
-//     * 签约方式
-//     */
-//    @ExcelProperty(value = "签约方式")
-//    private String signing;
-//    /**
-//     * 状态
-//     */
-//    @ExcelProperty(value = "状态", converter = ExcelConverter.class)
-//    @EasyExcel(type = LogisticsOrderEnum.class, status = NumberConstant.TWO)
-//    private String status;
-//    /**
-//     * 卸货地点
-//     */
-//    @ExcelProperty(value = "卸货地点")
-//    private String unloadAddress;
-//    /**
-//     * 关联承运订单号
-//     */
-//    @ExcelProperty(value = "关联承运订单号")
-//    private String wOrderNo;
-//    /**
-//     * 创建时间
-//     */
-//    @ExcelProperty(value = "创建时间")
-//    private String createTime;
-//    /**
-//     * 修改时间
-//     */
-//    @ExcelProperty(value = "修改时间")
-//    private String updateTime;
-
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -399,7 +399,7 @@ public class TransportCommonService {
             //未完成的量
             BigDecimal subtract = amount.subtract(loadAmount);
             //.setScale(2,BigDecimal.ROUND_HALF_DOWN)
-            BigDecimal add = order.getSubcontractAmount().add(subtract);
+            BigDecimal add = order.getSubcontractAmount().subtract(amount);
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(KwtLogisticsOrder::getId, order.getId())
                     .set(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)