提交新增合同文件校验

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ReviewWaybillOrderReq.java

@@ -51,4 +51,9 @@ public class ReviewWaybillOrderReq implements Serializable {
      */
     @Schema(description = "上传时间")
     private String uploadTime;
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDetailResp.java

@@ -139,6 +139,16 @@ public class WaybillOrderDetailResp implements Serializable {
          */
         @Schema(description = "过磅描述")
         private String weighingDesc;
+        /**
+         * 过磅图片地址
+         */
+        @Schema(description = "过磅图片地址")
+        private String weighingImgUrl;
+        /**
+         * 地磅名称
+         */
+        @Schema(description = "地磅名称")
+        private String weighingName;
 
     }
     @Data

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

@@ -3324,6 +3324,7 @@ public class KwtWaybillOrderV1Service {
         List<KwtWaybillOrderNode> nodeList = Lists.newArrayList() ;
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwtWaybillOrderNodes)){
             nodeList = kwtWaybillOrderNodes.stream()
+                    .filter(x->Objects.nonNull(x.getWeighbridgeId()))
                     .sorted(Comparator.comparing(KwtWaybillOrderNode::getCreateTime))
                     .collect(Collectors.toList());
         }
@@ -3377,13 +3378,17 @@ public class KwtWaybillOrderV1Service {
         KwtLogisticsOrderUnit carrierEnt = logisticsOrderUnitMap.getOrDefault(logOrder.getId() + "-" + UnitTypeEnum.CARRIAGE.getCode(), new KwtLogisticsOrderUnit());
         waybillOrderDetailResp.setTransEntName(transEnt.getFirmName());
         waybillOrderDetailResp.setCarrierEntName(carrierEnt.getFirmName());
-        List<WaybillOrderDetailResp.WeighingRecord> records = nodeList.stream().map(node -> {
-            WaybillOrderDetailResp.WeighingRecord weighingRecord = new WaybillOrderDetailResp.WeighingRecord();
-            weighingRecord.setWeighingTime(DateUtils.format(node.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
-            weighingRecord.setWeighingDesc(node.getRemark());
-            return weighingRecord;
-        }).collect(Collectors.toList());
-        waybillOrderDetailResp.setWeighingRecords(records);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(nodeList)){
+            List<WaybillOrderDetailResp.WeighingRecord> records = nodeList.stream().map(node -> {
+                WaybillOrderDetailResp.WeighingRecord weighingRecord = new WaybillOrderDetailResp.WeighingRecord();
+                weighingRecord.setWeighingTime(DateUtils.format(node.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
+                weighingRecord.setWeighingDesc(node.getRemark());
+                weighingRecord.setWeighingName(node.getWeighbridgeName());
+                weighingRecord.setWeighingImgUrl(node.getWeighUrl()) ;
+                return weighingRecord;
+            }).collect(Collectors.toList());
+            waybillOrderDetailResp.setWeighingRecords(records);
+        }
         WaybillOrderDetailResp.BillInfo billInfo = new WaybillOrderDetailResp.BillInfo();
         billInfo.setUploadByLabel(Objects.nonNull(userCacheResDto) ? userCacheResDto.getName() : "" );
         billInfo.setUploadTime(DateUtils.format(subtask.getUnloadUploadTime(),DateUtils.DATE_TIME_PATTERN));
@@ -3412,9 +3417,12 @@ public class KwtWaybillOrderV1Service {
         updateSubtask.setId(subtask.getId());
         //KwtWaybillOrderTicket kwtWaybillOrderTicket = new KwtWaybillOrderTicket();
         //单证审核 运单当前状态是已卸货，传入的订单是已完成
-        if (Objects.equals(status, CarWaybillV1Enum.WAIT_UNLOADING.getCode()) && Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())){
+        List<Integer> statusList = Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode());
+        if (statusList.contains( status) && Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())){
             updateOrder.setStatus( status);
             updateSubtask.setStatus(status);
+            updateSubtask.setRemark(req.getRemark());
+            updateSubtask.setUnloadAmount(org.apache.commons.lang3.StringUtils.isBlank(req.getUnloadAmount()) ? null  :  new BigDecimal(req.getUnloadAmount()));
             if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getAddressUrl())){
                 subtask.setUnloadUrl(req.getAddressUrl());
             }
@@ -3431,7 +3439,13 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder kwtLogisticsOrder = getKwtLogisticsOrder(kwtLogistics, subtask);
             boolean b1 = kwtLogisticsOrderRepository.updateById(kwtLogisticsOrder);
             // 存储记录
-            String remark = "审核通过，运单【"+ billOrder.getWOrderNo() + "】已完成";
+            String remark = null;
+            if (Objects.equals(status, CarWaybillV1Enum.COMPLETION_UNLOADING.getCode())){
+                 remark = "审核驳回，运单【"+ billOrder.getWOrderNo() + "】已驳回";
+            }else {
+                 remark = "审核通过，运单【"+ billOrder.getWOrderNo() + "】已完成";
+            }
+
             saveNode(billOrder, subtask, status,remark);
             if (!b || !b1){
                 throw new BusinessException("审核运单失败");
@@ -3444,7 +3458,8 @@ public class KwtWaybillOrderV1Service {
                 CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
             updateOrder.setStatus(status);
             updateSubtask.setStatus(status);
-            updateSubtask.setUnloadAmount(Objects.nonNull(req.getUnloadAmount()) ? new BigDecimal(req.getUnloadAmount()) : null);
+            updateSubtask.setRemark(req.getRemark());
+            updateSubtask.setUnloadAmount(org.apache.commons.lang3.StringUtils.isNotBlank(req.getUnloadAmount()) ? new BigDecimal(req.getUnloadAmount()) : null);
             if (org.apache.commons.lang3.StringUtils.isNotBlank(req.getAddressUrl())){
                 subtask.setUnloadUrl(req.getAddressUrl());
             }
@@ -3466,7 +3481,7 @@ public class KwtWaybillOrderV1Service {
             String remark = "供应方，【"+roleName+"】【"+LoginUserHolder.getUserName()+"】已审核单证";
             saveNode(billOrder, subtask, status,remark);
             if (!b ){
-               throw new BusinessException("完整单证失败");
+               throw new BusinessException("完善单证失败");
             }
             return Boolean.TRUE;
         }
@@ -3479,6 +3494,8 @@ public class KwtWaybillOrderV1Service {
         kwtWaybillOrderNode.setWSubtaskId(subtask.getId());
         kwtWaybillOrderNode.setOrderStatus(status);
         kwtWaybillOrderNode.setRemark(remark);
+        kwtWaybillOrderNode.setCreateBy(LoginUserHolder.getUserId());
+        kwtWaybillOrderNode.setTruckId(billOrder.getTruckId());
         waybillOrderNodeRepository.save(kwtWaybillOrderNode);
     }