车辆运单，只展示主单位

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderTicket.java

@@ -32,7 +32,7 @@ public class KwtWaybillOrderTicket implements Serializable {
     private Integer type;
 
     /**
-     * 装卸货单位
+     * 装卸货单位 0 主单位  其他副单位
      */
     private String unit;
 

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

@@ -366,10 +366,14 @@ public class KwtConsignOrderService {
                     CarWaybillVO carWaybillVo = new CarWaybillVO();
                     KwtWaybillOrderTicket loadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
-                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE));
+                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE)
+                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                    );
                     KwtWaybillOrderTicket unloadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
-                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO));
+                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO)
+                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                    );
                     //合理损耗
                     BigDecimal loss = order.getLoss() == null ? NumberConstant.ZERO_TWO : order.getLoss();
                     /**亏吨量/吨->装货量-卸货量
@@ -643,10 +647,14 @@ public class KwtConsignOrderService {
                     CarWaybillVO carWaybillVo = new CarWaybillVO();
                     KwtWaybillOrderTicket loadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
-                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE));
+                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE)
+                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                    );
                     KwtWaybillOrderTicket unloadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
-                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO));
+                            .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO)
+                            .eq(KwtWaybillOrderTicket::getUnit,"0")
+                    );
                     //合理损耗
                     BigDecimal loss = order.getLoss() == null ? NumberConstant.ZERO_TWO : order.getLoss();
                     /**亏吨量/吨->装货量-卸货量