Merge branch 'v21.1_jianzhuang_20240807' of…

performance-api/src/main/java/com/clx/performance/param/app/NeedAlertSuperviseInfoParam.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 装车范围校验检查参数
@@ -19,13 +20,9 @@ public class NeedAlertSuperviseInfoParam {
     @NotBlank(message = "运单编号不能为空")
     private String childNo;
 
-    @ApiModelProperty(value = "订单编号", example = "100000000")
-    @NotBlank(message = "订单编号不能为空")
-    private String orderNo;
-
 
     @ApiModelProperty(value = "类型 1-监装 2-监卸", example = "1")
-    @NotBlank(message = "类型不能为空")
+    @NotNull(message = "类型不能为空")
     private Integer type;
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -3457,6 +3457,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
+        //查询运单信息
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(DATA_NOT_FIND);
         //返回对象
         NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
         App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
@@ -3468,7 +3470,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         //通过订单号查询监装监卸信息
         SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
-        action.setOrderNo(param.getOrderNo());
+        action.setOrderNo(orderChild.getOrderNo());
         action.setType(param.getType());
 
         log.info("请求获取监装监卸信息参数,{}",action);