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

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

@@ -874,9 +874,6 @@ public class KwtWaybillOrderService {
 
         //操作人信息
         order.setStatus(CarWaybillEnum.PENDING_ORDER.getCode());
-        order.setCreateBy(LoginUserHolder.getUserId());
-        order.setCreateByName(LoginUserHolder.getUserName());
-        order.setCreateTime(circulate.getUpdateTime());
         order.setUpdateBy(LoginUserHolder.getUserId());
         order.setUpdateByName(LoginUserHolder.getUserName());
         order.setUpdateTime(circulate.getUpdateTime());
@@ -1595,7 +1592,7 @@ public class KwtWaybillOrderService {
         ticket.setWOrderId(waybillOrder.getId());
         ticket.setType(Global.NUMERICAL_ONE);
         ticket.setAmount(waybillOrder.getLoadAmount());
-        ticket.setUrls(params.getUrls());
+        ticket.setUrls(FileUtils.replaceAllBatch(params.getUrls()));
         ticket.setOperateTime(params.getOperateTime());
         waybillOrderTicketDao.insert(ticket);
 
@@ -1705,7 +1702,7 @@ public class KwtWaybillOrderService {
         ticket.setWOrderId(waybillOrder.getId());
         ticket.setType(Global.NUMERICAL_TWO);
         ticket.setAmount(waybillOrder.getUnloadAmount());
-        ticket.setUrls(params.getUrls());
+        ticket.setUrls(FileUtils.replaceAllBatch(params.getUrls()));
         ticket.setOperateTime(params.getOperateTime());
         waybillOrderTicketDao.insert(ticket);