1、单证审核逻辑处理；

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

@@ -39,7 +39,7 @@ public class WaybillOrderTicketApprovalV1Dto {
     @JsonProperty("loadOperateTime")
     @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "装货时间不能为空")
+    //@NotNull(message = "装货时间不能为空")
     private Date loadOperateTime;
 
     /**
@@ -63,7 +63,7 @@ public class WaybillOrderTicketApprovalV1Dto {
     @JsonProperty("unloadOperateTime")
     @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "卸货时间不能为空")
+    //@NotNull(message = "卸货时间不能为空")
     private Date unloadOperateTime;
 
     /**

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

@@ -2580,10 +2580,10 @@ public class KwtWaybillOrderService {
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(waybillOrder.getLoadAmount());
-        wOrder.setLoadTime(params.getLoadOperateTime());
+        //wOrder.setLoadTime(params.getLoadOperateTime());
         wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
         wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
-        wOrder.setUnloadTime(params.getUnloadOperateTime());
+        //wOrder.setUnloadTime(params.getUnloadOperateTime());
         wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());

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

@@ -4,6 +4,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.FileUtils;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.system.api.RemoteSystemService;
@@ -103,10 +104,11 @@ 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);
+
                 //对比是否存在更新
-                if (oldTicket != null && oldTicket.getAmount().doubleValue() == ticket.getAmount().doubleValue()
-                        && oldTicket.getUrls().equals(urls)
-                        && oldTicket.getOperateTime().compareTo(operateTime)== 0 )  {
+                if (oldTicket != null && bool1)  {
                     continue;
                 }
 
@@ -121,7 +123,7 @@ public class KwtWaybillOrderTicketService {
                 waybillOrderTicket.setUnit(ticket.getUnit());
                 waybillOrderTicket.setAmount(ticket.getAmount());
                 waybillOrderTicket.setUrls(urls);
-                waybillOrderTicket.setOperateTime(operateTime);
+                //waybillOrderTicket.setOperateTime(operateTime);
                 waybillOrderTicketMapper.insert(waybillOrderTicket);
             }
         }