Ver Fonte

消息列表跳转

lengfaqiang há 2 anos atrás
pai
commit
ba0394ad5c

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

@@ -134,7 +134,7 @@ public class AddOrderDTO {
      * 总量
      */
     @NotNull(message = "总量不能为空")
-    @Digits(integer = 10, fraction = 2, message = "总量格式错误")
+    @Digits(integer = 8, fraction = 2, message = "总量格式错误")
     @DecimalMin(value = "0.00", message = "总量最小值为{value}")
     private BigDecimal amount;
 

+ 1 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -2043,8 +2043,8 @@ public class AcceptCarriageOrderService {
 //                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);
 
         commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
-                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
                 , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
+                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
                 , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
                 , "1"
         );

+ 4 - 4
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -281,10 +281,10 @@ public class LogisticsConsignmentService {
             carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
             carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
 
-            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
-            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
-            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
-            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            pcConsignUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
             consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
             carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
             type = "1";