1.序列化bug

2.单证审核bug

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/GoodsLoadingV1Param.java

@@ -1,6 +1,8 @@
 package com.sckw.order.api.model;
 
 import lombok.Data;
+
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -9,7 +11,7 @@ import java.math.BigDecimal;
  * @date 2023/12/7 0007
  */
 @Data
-public class GoodsLoadingV1Param {
+public class GoodsLoadingV1Param implements Serializable {
 
     /**
      * 装卸货单位

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

@@ -63,10 +63,10 @@ public class KwtTransportCommonService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteContractService remoteContractService;
 
     @Autowired

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.service;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
@@ -103,8 +104,8 @@ public class KwtWaybillOrderTicketService {
         if (CollectionUtils.isNotEmpty(loading)) {
             for (WaybillOrderTicketLoadingDto ticket : loading) {
                 KwtWaybillOrderTicket oldTicket = waybillOrderTicketMapper.findWaybillOrderTicketV1(wOrderId, type, ticket.getUnit());
-                Boolean bool1 = oldTicket.getAmount().doubleValue() == ticket.getAmount().doubleValue();
-                Boolean bool2 = oldTicket.getUrls().equals(urls);
+//                Boolean bool1 = oldTicket.getAmount().doubleValue() == ticket.getAmount().doubleValue();
+//                Boolean bool2 = oldTicket.getUrls().equals(urls);
 
                 //对比是否存在更新
 //                if (oldTicket != null && bool1 && bool2)  {
@@ -113,7 +114,10 @@ public class KwtWaybillOrderTicketService {
 
                 //删除
                 oldTicket.setDelFlag(Global.YES);
-                waybillOrderTicketMapper.updateById(oldTicket);
+//                waybillOrderTicketMapper.updateById(oldTicket);
+                waybillOrderTicketMapper.update(oldTicket,new LambdaUpdateWrapper<KwtWaybillOrderTicket>()
+                        .set(KwtWaybillOrderTicket::getDelFlag,1)
+                        .eq(KwtWaybillOrderTicket::getId,oldTicket.getId()));
                 //新增
                 KwtWaybillOrderTicket waybillOrderTicket = new KwtWaybillOrderTicket();
                 BeanUtils.copyProperties(oldTicket, waybillOrderTicket);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderTicketMapper.xml

@@ -43,7 +43,7 @@
         select
         id, w_order_id wOrderId, `type`, unit, amount, gross_amount grossAmount, tare_amount tareAmount,
         urls, operate_time, remark, `status`, create_by createBy, create_time createTime, update_by updateBy,
-        update_time updateTime
+        update_time updateTime,del_flag as delFlag
         from kwt_waybill_order_ticket
         where del_flag = 0
         <if test="wOrderId != null and wOrderId != ''">