订单详情的到仓详情补充完善

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -50,6 +50,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignee.OrderConsigneeDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsignorDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderDeparture.OrderDepartureDO;
+import cn.iocoder.yudao.module.order.dal.dataobject.orderException.OrderExceptionDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderObjective.OrderObjectiveDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO;
@@ -64,8 +65,10 @@ import cn.iocoder.yudao.module.order.dal.mysql.orderWarehouseIn.OrderWarehouseIn
 import cn.iocoder.yudao.module.order.dto.*;
 import cn.iocoder.yudao.module.order.enums.CustomDraweeEnum;
 import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum;
+import cn.iocoder.yudao.module.order.enums.OrderExceptionEnum;
 import cn.iocoder.yudao.module.order.enums.TransportTypeShortEnum;
 import cn.iocoder.yudao.module.order.service.order.*;
+import cn.iocoder.yudao.module.order.service.orderException.OrderExceptionService;
 import cn.iocoder.yudao.module.order.service.orderWarehouseIn.OrderWarehouseInService;
 import cn.iocoder.yudao.module.order.service.orderWarehousePicture.OrderWarehousePictureService;
 import cn.iocoder.yudao.module.order.vo.approval.OrderApprovalHeadBaseVO;
@@ -74,6 +77,7 @@ import cn.iocoder.yudao.module.order.vo.approval.OrderSpecialBatchApplyOrderItem
 import cn.iocoder.yudao.module.order.vo.approval.OrderSpecialBatchApplyVO;
 import cn.iocoder.yudao.module.order.vo.order.*;
 import cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO;
+import cn.iocoder.yudao.module.order.vo.orderException.ExceptionTypeResultVO;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderFeeDetailBackVO;
 import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemBackVO;
@@ -164,6 +168,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     private final OrderWarehouseInService orderWarehouseInService;
 
     private final CustomerContactsService customerContactsService;
+    private final OrderExceptionService orderExceptionService;
 
 
     private UeProperties ueProperties;
@@ -838,8 +843,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 item.setWarehouseRecordRemark(warehouseInDO.getWarehouseRecordRemark());
             }
 
-
-            // 转换赋值出刷数值
+            // 转换赋值初始数值
             item.setInitialChargeWeight(item.getChargeWeight());
             item.setInitialChargeVolume(item.getChargeVolume());
             item.setInitialChargeQuantity(item.getChargeQuantity());
@@ -847,6 +851,30 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             item.setChargeWeight(new BigDecimal(item.getVWeight()));
             item.setChargeVolume(new BigDecimal(item.getWVolume()));
             item.setChargeQuantity(new BigDecimal(item.getQQuantity()));
+            // 订单项到仓异常登记信息
+            if (Objects.nonNull(item.getWarehouseCheckInfoVO())) {
+                List<String> exceptionKeys = Arrays.asList(OrderExceptionEnum.ORDER_MISS_EXCEPTION.getKey(),
+                        OrderExceptionEnum.ORDER_SUPERFLUOUS_GOODS_EXCEPTION.getKey(),
+                        OrderExceptionEnum.ORDER_DAMAGE_EXCEPTION.getKey(),
+                        OrderExceptionEnum.ORDER_IN_WATER_EXCEPTION.getKey(),
+                        OrderExceptionEnum.ORDER_ABNORMAL_WEIGHT_EXCEPTION.getKey());
+                List<OrderExceptionDO> orderExceptionDOList = orderExceptionService.list(new LambdaQueryWrapper<OrderExceptionDO>()
+                        .eq(OrderExceptionDO::getOrderItemId, item.getOrderItemId())
+                        .in(OrderExceptionDO::getOrderExceptionType, exceptionKeys));
+                if (CollectionUtil.isNotEmpty(orderExceptionDOList)) {
+                    List<ExceptionTypeResultVO> itemExceptionList = new ArrayList<>();
+                    for (OrderExceptionDO orderExceptionDO : orderExceptionDOList) {
+                        OrderExceptionEnum exceptionEnum = OrderExceptionEnum.getEnumByKey(orderExceptionDO.getOrderExceptionType());
+                        // 异常状态0:待处理，1处理中，2已处理
+                        String result = orderExceptionDO.getOrderExceptionStatus() == 0 ? "待处理" : (orderExceptionDO.getOrderExceptionStatus() == 1 ? "1处理中" : "已处理");
+                        ExceptionTypeResultVO typeResultVO = new ExceptionTypeResultVO();
+                        typeResultVO.setExceptionType(I18nMessage.getLang() == 0 ? exceptionEnum.getZhValueDesc() : exceptionEnum.getEnValueDesc());
+                        typeResultVO.setResult(result);
+                        itemExceptionList.add(typeResultVO);
+                    }
+                    item.setItemExceptionList(itemExceptionList);
+                }
+            }
             //订单项入仓影像
             List<OrderWarehousePictureDO> warehousePictureList =
                     orderWarehousePictureService.getWarehousePictureList(5, item.getOrderItemId());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/ExceptionTypeResultVO.java

+package cn.iocoder.yudao.module.order.vo.orderException;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("异常类型结果值")
+public class ExceptionTypeResultVO {
+    @ApiModelProperty("异常类型")
+    private String exceptionType;
+    @ApiModelProperty("异常处理结果状态")
+    private String result;
+}

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderItem/OrderItemBackVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.order.vo.orderItem;
 
 import cn.iocoder.yudao.module.order.vo.order.WarehouseCheckInfoVO;
 import cn.iocoder.yudao.module.order.vo.order.WarehouseInInfoVO;
+import cn.iocoder.yudao.module.order.vo.orderException.ExceptionTypeResultVO;
 import cn.iocoder.yudao.module.product.vo.coupon.CouponInfoVO;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -469,6 +470,9 @@ public class OrderItemBackVO {
     @ApiModelProperty(value = "订单项到仓影像列表")
     private List<String> checkPictureUrls;
 
+    @ApiModelProperty(value = "订单项到仓异常登记列表")
+    private List<ExceptionTypeResultVO> itemExceptionList;
+
     public void setWarehouseCheckInfo(String warehouseCheckInfo) {
         this.warehouseCheckInfo = warehouseCheckInfo;
         if (StringUtils.isNotBlank(warehouseCheckInfo)) {