提交运单审核新增审核图片和重量的节点

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

@@ -4338,10 +4338,10 @@ public class KwtWaybillOrderV1Service {
                  //remark = "审核驳回，运单【"+ billOrder.getWOrderNo() + "】已驳回";
                 remark = "因【"+ req.getRemark() + "】审核未通过";
             }else {
-                 remark = "审核通过，运单【"+ billOrder.getWOrderNo() + "】已完成";
+                 remark = "审核通过，卸货量【"+ req.getUnloadAmount() + "】，运单【"+ billOrder.getWOrderNo() + "】已完成";
             }
 
-            saveNode(billOrder, subtask, status,remark);
+            saveNode(billOrder, subtask, status,remark,req.getAddressUrl());
             if (!b ){
                 throw new BusinessException("审核运单失败");
             }
@@ -4379,8 +4379,8 @@ public class KwtWaybillOrderV1Service {
             Long currentRoleId = LoginUserHolder.getCurrentRoleId();
             KwsRoleDto kwsRoleDto = remoteSystemService.queryByRoleIdAndEntId(currentRoleId);
             String roleName =  Objects.nonNull(kwsRoleDto) ? kwsRoleDto.getName() : "";
-            String remark = "供应方，【"+roleName+"】【"+LoginUserHolder.getUserName()+"】已审核单证";
-            saveNode(billOrder, subtask, status,remark);
+            String remark = "【"+roleName+"】【"+LoginUserHolder.getUserName()+"】已完善单证，卸货量【"+ req.getUnloadAmount() + "】，运单【"+ billOrder.getWOrderNo() + "】已完成";
+            saveNode(billOrder, subtask, status,remark,req.getAddressUrl());
             if (!b ){
                throw new BusinessException("完善单证失败");
             }
@@ -4829,7 +4829,7 @@ public class KwtWaybillOrderV1Service {
         tradeOrderInfoService.orderSettle(tradeOrderSettlePara);
     }
 
-    private void saveNode(KwtWaybillOrder billOrder, KwtWaybillOrderSubtask subtask, Integer status,String remark) {
+    private void saveNode(KwtWaybillOrder billOrder, KwtWaybillOrderSubtask subtask, Integer status,String remark,String imageUrl) {
         KwtWaybillOrderNode kwtWaybillOrderNode = new KwtWaybillOrderNode();
         kwtWaybillOrderNode.setTruckId(billOrder.getTruckId());
         kwtWaybillOrderNode.setTruckNo(billOrder.getTruckNo());
@@ -4842,6 +4842,7 @@ public class KwtWaybillOrderV1Service {
         kwtWaybillOrderNode.setRemark(remark);
         kwtWaybillOrderNode.setCreateBy(LoginUserHolder.getUserId());
         kwtWaybillOrderNode.setTruckId(billOrder.getTruckId());
+        kwtWaybillOrderNode.setWeighUrl(imageUrl);
         kwtWaybillOrderNodeRepository.save(kwtWaybillOrderNode);
     }