分包托运补充展示字段

采购订单新增返回展示字段

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

@@ -532,10 +532,10 @@ public class AcceptCarriageOrderService {
 //        order.setLossUnit(bo.getLossUnit());
         order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
-        order.setGoodsPrice(new BigDecimal(bo.getGoodsPrice()));
+        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
         order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
-        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
+//        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
         order.setStartTime(bo.getShipmentsDateTime());
         order.setEndTime(bo.getReceiveGoodsDateTime());
         order.setRemark(bo.getRemark());

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

@@ -743,10 +743,10 @@ public class ConsignOrderService {
         //业务汇总类型
         busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         //操作对象（1新增/2修改/3替换数据）
-        busSum.setMethod(2);
+//        busSum.setMethod(2);
         //业务汇总数据对象
         busSum.setObject(lOrder);
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+//        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         busSum.setMethod(NumberConstant.TWO);
         streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
     }
@@ -915,9 +915,10 @@ public class ConsignOrderService {
     /**
      * 托运订单-新建订单
      *
-     * @param addOrderDTO
+     * @param addOrderDTO   页面传递数据
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult addOrder(AddOrderDTO addOrderDTO) throws ParseException {
         HttpResult httpResult = ValidUtil.serviceValid(addOrderDTO);
         if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
@@ -934,10 +935,10 @@ public class ConsignOrderService {
         contractList.add(Long.parseLong(addOrderDTO.getContractId()));
         Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = remoteContractService.queryContractBaseInfo(contractList);
         if (CollectionUtils.isEmpty(longContractCommonInfoResDtoMap)) {
-            throw new RuntimeException("托运订单新建订单-并未有对应合同,应先签约合同");
+            throw new BusinessException("托运订单新建订单-并未有对应合同,应先签约合同");
         }
         if (longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId())) == null) {
-            throw new RuntimeException("托运订单新建订单-并未有对应合同,应先签约合同");
+            throw new BusinessException("托运订单新建订单-并未有对应合同,应先签约合同");
         }
         ContractCommonInfoResDto infoResDto = longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId()));
         /**状态判断

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

@@ -774,15 +774,17 @@ public class LogisticsConsignmentService {
         for (String id : stringList) {
             List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
-            Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
-            for (OrderCarDTO orderCarDTO : list) {
+            if (CollectionUtils.isNotEmpty(collect)) {
+                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
+                for (OrderCarDTO orderCarDTO : list) {
 //            orderCarDTO.setDriverId(String.valueOf(orderCarDTO.getDriverId()));
 //            orderCarDTO.setDriverName(orderCarDTO.getDriverName());
 //            orderCarDTO.setDriverPhone(orderCarDTO.getDriverPhone());
 //            orderCarDTO.setDriverCard(orderCarDTO.getDriverCard());
-                orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-                        null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-                        null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                    orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
+                            null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
+                            null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                }
             }
             if (CollectionUtils.isNotEmpty(list)) {
                 returnList.addAll(list);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -139,7 +139,7 @@
         a.update_time AS updateTime
         FROM
         kwt_logistics_order a
-        LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id
+        LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id and a.bind_status = '0'
 <!--        LEFT JOIN kwt_logistics_order_unit d ON a.id = d.l_order_id-->
         LEFT JOIN kwt_logistics_order_contract c ON a.id = c.l_order_id
 <!--        LEFT JOIN ( SELECT l_order_id FROM kwt_logistics_order_unit WHERE unit_type = 1 AND ent_id = #{entId} ) g ON a.id = g.l_order_id-->