提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/res/QueryListResDto.java

@@ -168,6 +168,10 @@ public class QueryListResDto {
      * 父合同名
      */
     private String contractPname;
+    /**
+     * 父合同编号
+     */
+    private String contractPidNo;
 
     /**
      * 卸货方式

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -131,6 +131,11 @@ public class QueryListResVo implements Serializable {
      */
     @Schema(description = "父合同名")
     private String contractPname;
+    /**
+     * 主合同编号
+     */
+    @Schema(description = "主合同编号")
+    private String contractPidNo;
 
     /**
      * 计费方式中文名

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -220,7 +220,7 @@
         a.id,
         a.remark,
         a.signing_way,
-        a.signTime signTime,
+        a.sign_time signTime,
         a.status,
         b.unit_type,
         b.ent_id,
@@ -230,6 +230,7 @@
         a.contract_pid contractPid,
         a.performed_amount performedAmount,
         f.name contractPname,
+        f.contract_no contractPidNo,
         a.unload_way   unloadWay,
         a.signing_way signingWay
         from kwc_contract_trade a

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -59,10 +59,11 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .last("limit 1"));
     }
 
-    public KwtWaybillOrder findOneByTruckNo(String truckNo) {
+    public KwtWaybillOrder findOneByTruckNo(String truckNo, Long entId ) {
         return getOne(Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .eq(KwtWaybillOrder::getDelFlag,0)
                 .eq(KwtWaybillOrder::getTruckNo,truckNo)
+                .eq(KwtWaybillOrder::getEntId, entId)
                 .orderByDesc(KwtWaybillOrder::getId)
                 .last("limit 1"));
     }

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

@@ -12,6 +12,7 @@ import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.HttpUtil;
 import com.sckw.core.web.constant.CommonConstants;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.vo.RDriverVo;
@@ -336,7 +337,8 @@ public class kwfTruckTraceService {
             instance.setLocationTime(collectZjxlResponse.getResult().getFirstVcl().getOfflineTime());
         }
         //查询关联订单号
-        KwtWaybillOrder oneByTruckNo = kwtWaybillOrderRepository.findOneByTruckNo(truckNo);
+
+        KwtWaybillOrder oneByTruckNo = kwtWaybillOrderRepository.findOneByTruckNo(truckNo,LoginUserHolder.getEntId());
 
         KwtWaybillOrderSubtask waybillOrderSubtask = kwtWaybillOrderSubtaskRepository.findOneByWOrderNo(oneByTruckNo.getWOrderNo());
         instance.setLogicOrderNo(Objects.nonNull(waybillOrderSubtask) && Objects.nonNull(waybillOrderSubtask.getLOrderId())
@@ -410,13 +412,13 @@ public class kwfTruckTraceService {
      */
     public CurrentTaskTraceReqVo queryCurrentTaskTrace(CurrentTaskTraceReq req) {
         log.info("查询当前任务轨迹参数：{}", req);
-       
 
+        Long entId = LoginUserHolder.getEntId();
         String wOrderNo = StringUtils.EMPTY ;
         if (StringUtils.isNotBlank(req.getOrderNo())){
             wOrderNo  = req.getOrderNo();
         }else {
-            KwtWaybillOrder waybillOrder = kwtWaybillOrderRepository.findOneByTruckNo(req.getTruckNo());
+            KwtWaybillOrder waybillOrder = kwtWaybillOrderRepository.findOneByTruckNo(req.getTruckNo(),entId);
             wOrderNo = Optional.ofNullable(waybillOrder).map(KwtWaybillOrder::getWOrderNo).orElse("");
         }
         //查询数据中台获取轨迹