Skip to content

J
jiedao-api-boot-master
Commit 81ec0e30 authored by honghy's avatar honghy Committed by wux
Browse files
Options

异常处理多语言

parent 465effc1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 131 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/dict/core/dto/DictDataRespDTO.java
View file @ 81ec0e30
......@@ -20,7 +20,7 @@ public class DictDataRespDTO {
*/
private String labelEn;
/**
* 字典英文标签
* 字典法文标签
*/
private String labelFr;
/**
......
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/dto/ChannelDto.java
View file @ 81ec0e30
......@@ -25,6 +25,10 @@ public class ChannelDto extends BaseDO {
* 名称-英文
*/
private String nameEn;
/**
* 名称-法文
*/
private String nameFr;
/**
* 内部名称-中文
*/
......@@ -33,6 +37,10 @@ public class ChannelDto extends BaseDO {
* 内部名称-英文
*/
private String internalNameEn;
/**
* 内部名称-法文
*/
private String internalNameFr;
/**
* 类型编码
*/
......@@ -74,6 +82,10 @@ public class ChannelDto extends BaseDO {
* 备注-英文
*/
private String remarksEn;
/**
* 备注-法文
*/
private String remarksFr;
/**
* 状态(0:禁用 1:启用)
*/
......
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/QueryChannelInfoEvent.java
View file @ 81ec0e30
......@@ -27,6 +27,10 @@ public class QueryChannelInfoEvent {
* 名称-英文
*/
private String nameEn;
/**
* 名称-法文
*/
private String nameFr;
/**
* 内部名称-中文
*/
......@@ -35,6 +39,10 @@ public class QueryChannelInfoEvent {
* 内部名称-英文
*/
private String internalNameEn;
/**
* 内部名称-法文
*/
private String internalNameFr;
/**
* 类型编码
......@@ -76,6 +84,10 @@ public class QueryChannelInfoEvent {
* 备注-英文
*/
private String remarksEn;
/**
* 备注-法文
*/
private String remarksFr;
/**
* 状态(0:禁用 1:启用)
*/
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderExceptionEnum.java
View file @ 81ec0e30
......@@ -8,47 +8,47 @@ import lombok.Getter;
*/
@Getter
public enum OrderExceptionEnum {
ORDER_NO_QUOTE_EXCEPTION("order_no_quote_exception", "未报价异常", "no quote"),
ORDER_SUPERFLUOUS_BOX_EXCEPTION("order_superfluous_box_exception", "多箱异常", "superfluous box"),
ORDER_LACK_BOX_EXCEPTION("order_lack_box_exception", "少箱异常", "lack box"),
ORDER_PAY_EXCEPTION("order_pay_exception", "产品需要预付运费异常", "pay"),
ORDER_MISS_EXCEPTION("order_miss_exception", "货物丢失异常", "miss goods"),
ORDER_SUPERFLUOUS_GOODS_EXCEPTION("order_superfluous_goods_exception", "货物增多异常", "superfluous goods"),
ORDER_DAMAGE_EXCEPTION("order_damage_exception", "货物破损异常", "damage exception"),
ORDER_IN_WATER_EXCEPTION("order_in_water_exception", "货物浸水异常", "in water"),
ORDER_ABNORMAL_WEIGHT_EXCEPTION("goods_weight_exception", "货物重量异常", "abnormal weight"),
ORDER_HEAVY_CARGO_EXCEPTION("order_heavy_cargo_exception", "重货异常", "heavy cargo"),
ORDER_BULKY_CARGO_EXCEPTION("order_bulky_cargo_exception", "泡货异常", "bulky cargo"),
ORDER_DOC_EXCEPTION("order_doc_exception", "单证异常", "doc exception"),
ORDER_CONSIGNOR_EXCEPTION("order_consignor_exception", "发货人异常", "consignor exception "),
ORDER_COD_EXCEPTION("order_cod_exception", "代收货款异常", "cod"),
ORDER_OTHER_EXCEPTION("order_other_exception", "其它异常", "other exception"),
ORDER_PICK_UP_EXCEPTION("order_pick_up_exception", "提货异常", "pick up exception"),
NOT_CUSTOMER_SERVICE_EXCEPTION("not_customer_service_exception", "未分配客户经理异常", "not customer service exception"),
FEE_EXCEPTION("fee_exception", "费用异常", "fee exception"),
GOODS_ADD_EXCEPTION("goods_add_exception", "新增商品异常", "add product exception"),
ORDER_NO_QUOTE_EXCEPTION("order_no_quote_exception", "未报价异常", "no quote","Non cité"),
ORDER_SUPERFLUOUS_BOX_EXCEPTION("order_superfluous_box_exception", "多箱异常", "superfluous box","Plusieurs cartons (calcul des frais d'expédition)"),
ORDER_LACK_BOX_EXCEPTION("order_lack_box_exception", "少箱异常", "lack box","manque de boîtes"),
ORDER_PAY_EXCEPTION("order_pay_exception", "产品需要预付运费异常", "pay","Le produit nécessite un prépaiement des frais de transport"),
ORDER_MISS_EXCEPTION("order_miss_exception", "货物丢失异常", "miss goods","Perte de marchandises"),
ORDER_SUPERFLUOUS_GOODS_EXCEPTION("order_superfluous_goods_exception", "货物增多异常", "superfluous goods","Augmentation de la marchandise"),
ORDER_DAMAGE_EXCEPTION("order_damage_exception", "货物破损异常", "damage exception","Marchandises endommagées"),
ORDER_IN_WATER_EXCEPTION("order_in_water_exception", "货物浸水异常", "in water","Marchandises endommagées par l'eau"),
ORDER_ABNORMAL_WEIGHT_EXCEPTION("goods_weight_exception", "货物重量异常", "abnormal weight","Poids des marchandises anormal"),
ORDER_HEAVY_CARGO_EXCEPTION("order_heavy_cargo_exception", "重货异常", "heavy cargo","order.heavy.cargo.exception"),
ORDER_BULKY_CARGO_EXCEPTION("order_bulky_cargo_exception", "泡货异常", "bulky cargo","Anomalie de marchandises du poids volumique"),
ORDER_DOC_EXCEPTION("order_doc_exception", "单证异常", "doc exception","Anomalie des documents"),
ORDER_CONSIGNOR_EXCEPTION("order_consignor_exception", "发货人异常", "consignor exception","Expéditeur anormal"),
ORDER_COD_EXCEPTION("order_cod_exception", "代收货款异常", "cod","Anomalie dans l'encaissement des paiements"),
ORDER_OTHER_EXCEPTION("order_other_exception", "其它异常", "other exception","Autre anomalie"),
ORDER_PICK_UP_EXCEPTION("order_pick_up_exception", "提货异常", "pick up exception","Anomalie de retrait"),
NOT_CUSTOMER_SERVICE_EXCEPTION("not_customer_service_exception", "未分配客户经理异常", "not customer service exception","Responsable client non attribué"),
FEE_EXCEPTION("fee_exception", "费用异常", "fee exception","Anomalie des frais"),
GOODS_ADD_EXCEPTION("goods_add_exception", "新增商品异常", "add product exception","Exception sur les nouveaux produits"),
//--------------------2.0空运新增-start---------------
LINE_LOOP_EXCEPTION("line_loop_exception", "线路单询异常", "line loop exception"),
LINE_LOOP_EXCEPTION("line_loop_exception", "线路单询异常", "line loop exception","Anomalie dans la demande de ligne"),
CUSTOMS_FEE_NOT_QUOTE_EXCEPTION("customs_fee_not_quote_exception", "清关费未报价异常", "customs fee not quote exception"),
GOODS_OVERWEIGHT_EXCEPTION("overweight_exception", "商品重量超限异常", "overweight exception"),
CHANNEL_PACKAGING_OVERWEIGHT_EXCEPTION("channel_packaging_overweight_exception", "渠道包装重量超限异常", "channel packaging overweight exception"),
CUSTOMS_FEE_NOT_QUOTE_EXCEPTION("customs_fee_not_quote_exception", "清关费未报价异常", "customs fee not quote exception","Anomalie des frais de dédouanement non tarifés"),
GOODS_OVERWEIGHT_EXCEPTION("overweight_exception", "商品重量超限异常", "overweight exception","Poids du produit dépassé"),
CHANNEL_PACKAGING_OVERWEIGHT_EXCEPTION("channel_packaging_overweight_exception", "渠道包装重量超限异常", "channel packaging overweight exception","Le poids de l'emballage du canal dépasse l'exception limite"),
//不可出渠道异常， 处理异常添加注释
NOT_SHIPPING_CHANNEL_EXCEPTION("not_shipping_channel_exception", "不可出渠道异常", "not shipping channel exception"),
NOT_SHIPPING_CHANNEL_EXCEPTION("not_shipping_channel_exception", "不可出渠道异常", "not shipping channel exception","Anomalie dans le canal d'expédition"),
GOODS_WEIGHT_EXCEPTION("goods_weight_exception", "货物重量异常", "goods weight exception"),
IN_WAREHOUSING_DIFF_EXCEPTION("in_warehousing_diff_exception", "入仓特性不符异常", "in warehousing diff exception"),
STOCK_UP_EXCEPTION("stock_up_exception", "备货异常", "stock up exception"),
GOODS_WEIGHT_EXCEPTION("goods_weight_exception", "货物重量异常", "goods weight exception","Poids des marchandises anormal"),
IN_WAREHOUSING_DIFF_EXCEPTION("in_warehousing_diff_exception", "入仓特性不符异常", "in warehousing diff exception","Anomalie des caractéristiques de réception"),
STOCK_UP_EXCEPTION("stock_up_exception", "备货异常", "stock up exception","Anomalie de préparation de commande"),
CHANNEL_EXCEPTION("channel_exception", "渠道异常", "channel exception"),
CHANNEL_EXCEPTION("channel_exception", "渠道异常", "channel exception","Anomalie du canal."),
//--------------------2.0空运新增-end---------------
LINE_WEIGHT_EXCEPTION("line_weight_exception", "路线重量超限异常", "line weight exception");
LINE_WEIGHT_EXCEPTION("line_weight_exception", "路线重量超限异常", "line weight exception","Anomalie de dépassement de poids de la ligne");
private final String key;
......@@ -57,10 +57,13 @@ public enum OrderExceptionEnum {
private final String enValueDesc;
OrderExceptionEnum(String key, String zhValueDesc, String enValueDesc) {
private final String frValueDesc;
OrderExceptionEnum(String key, String zhValueDesc, String enValueDesc, String frValueDesc) {
this.key = key;
this.zhValueDesc = zhValueDesc;
this.enValueDesc = enValueDesc;
this.frValueDesc = frValueDesc;
}
public static OrderExceptionEnum getEnumByKey(String key) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderAirServiceImpl.java
View file @ 81ec0e30
......@@ -156,8 +156,9 @@ public class OrderAirServiceImpl extends AbstractService<OrderMapper, OrderDO> i
orderWarehousePictureService.createWarehousePictureBatch(exceptionUrls, 4, orderId);
// 异常
String descZh = getDesc(orderManualExceptionBatchReqVO.getDescZh(), orderManualExceptionBatchReqVO.getDescEn(), manualExceptionType, 0);
String descEn = getDesc(orderManualExceptionBatchReqVO.getDescZh(), orderManualExceptionBatchReqVO.getDescEn(), manualExceptionType, 1);
String descZh = getDesc(orderManualExceptionBatchReqVO.getDescZh(), orderManualExceptionBatchReqVO.getDescEn(), orderManualExceptionBatchReqVO.getDescFr(), manualExceptionType, 0);
String descEn = getDesc(orderManualExceptionBatchReqVO.getDescZh(), orderManualExceptionBatchReqVO.getDescEn(), orderManualExceptionBatchReqVO.getDescFr(), manualExceptionType, 1);
String descFr = getDesc(orderManualExceptionBatchReqVO.getDescZh(), orderManualExceptionBatchReqVO.getDescEn(), orderManualExceptionBatchReqVO.getDescFr(), manualExceptionType, 2);
OrderExceptionCreateReqVO orderExceptionCreateReqVO = new OrderExceptionCreateReqVO();
orderExceptionCreateReqVO.setOrderId(orderId);
......@@ -167,7 +168,7 @@ public class OrderAirServiceImpl extends AbstractService<OrderMapper, OrderDO> i
orderExceptionCreateReqVO.setOrderExceptionAttr(CollectionUtil.join(exceptionUrls, ","));
}
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).build());
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).descFr(descFr).build());
orderExceptionService.createOrderException(orderExceptionCreateReqVO);
}
......@@ -265,7 +266,7 @@ public class OrderAirServiceImpl extends AbstractService<OrderMapper, OrderDO> i
}
}
private String getDesc(String descZh, String descEn, String manualExceptionType, Integer lang) {
private String getDesc(String descZh, String descEn, String descFr, String manualExceptionType, Integer lang) {
StringBuffer stringBuffer = new StringBuffer();
for (String value : manualExceptionType.split(",")) {
DictDataRespDTO data = DictFrameworkUtils.getDictDataFromCache("manual_exception_type", value);
......@@ -283,6 +284,9 @@ public class OrderAirServiceImpl extends AbstractService<OrderMapper, OrderDO> i
if (lang == 1 && StringUtils.isNotEmpty(descEn)) {
stringBuffer.append(": ").append(descEn);
}
if (lang == 2 && StringUtils.isNotEmpty(descFr)) {
stringBuffer.append(": ").append(descFr);
}
return stringBuffer.toString();
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseAdjust/OrderWarehouseAdjustServiceImpl.java
View file @ 81ec0e30
......@@ -486,10 +486,11 @@ public class OrderWarehouseAdjustServiceImpl extends AbstractService<OrderWareho
// 异常
String descZh = getDesc(arrivedVO, manualExceptionType, 0);
String descEn = getDesc(arrivedVO, manualExceptionType, 1);
String descFr = getDesc(arrivedVO, manualExceptionType, 2);
OrderExceptionCreateReqVO orderExceptionCreateReqVO = genOrderException(orderId, null, orderDO,
OrderExceptionEnum.ORDER_OTHER_EXCEPTION,
descZh, descEn, arrivedVO.getExceptionUrls());
descZh, descEn, descFr, arrivedVO.getExceptionUrls());
orderExceptionService.createOrderException(orderExceptionCreateReqVO);
note = "-转异";
......@@ -563,23 +564,23 @@ public class OrderWarehouseAdjustServiceImpl extends AbstractService<OrderWareho
if (StringUtils.isNotEmpty(stringBuffer)) {
stringBuffer.append(",");
}
stringBuffer.append(lang == 0 ? data.getLabel() : data.getLabelEn());
stringBuffer.append(lang == 0 ? data.getLabel() : lang == 1 ? data.getLabelEn():data.getLabelFr());
}
}
if (StringUtils.isNotEmpty(stringBuffer)) {
stringBuffer.append(": ");
}
stringBuffer.append(lang == 0 ? arrivedVO.getDescZh() : arrivedVO.getDescEn());
stringBuffer.append(lang == 0 ? arrivedVO.getDescZh() : lang==1 ? arrivedVO.getDescEn(): arrivedVO.getDescFr());
return stringBuffer.toString();
}
private OrderExceptionCreateReqVO genOrderException(Long orderId, Long orderItemId, OrderDO orderDO, OrderExceptionEnum orderSuperfluousBoxException, String descZh, String descEn, List<String> exceptionUrls) {
private OrderExceptionCreateReqVO genOrderException(Long orderId, Long orderItemId, OrderDO orderDO, OrderExceptionEnum orderSuperfluousBoxException, String descZh, String descEn,String descFr, List<String> exceptionUrls) {
OrderExceptionCreateReqVO orderExceptionCreateReqVO = new OrderExceptionCreateReqVO();
orderExceptionCreateReqVO.setOrderId(orderId);
orderExceptionCreateReqVO.setOrderItemId(orderItemId);
orderExceptionCreateReqVO.setOrderNumber(orderDO.getOrderNo());
orderExceptionCreateReqVO.setOrderExceptionType(orderSuperfluousBoxException.getKey());
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).build());
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).descFr(descFr).build());
if (CollectionUtil.isNotEmpty(exceptionUrls)) {
orderExceptionCreateReqVO.setOrderExceptionAttr(CollectionUtil.join(exceptionUrls, ","));
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java
View file @ 81ec0e30
package cn.iocoder.yudao.module.order.vo.order;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
import cn.iocoder.yudao.framework.common.util.spring.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
......@@ -16,21 +15,23 @@ import cn.iocoder.yudao.module.order.vo.orderConsignor.OrderConsignorBackVO;
import cn.iocoder.yudao.module.order.vo.orderDeparture.OrderDepartureBackVO;
import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemBackVO;
import cn.iocoder.yudao.module.order.vo.orderObjective.OrderObjectiveBackVO;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import io.swagger.annotations.*;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
......@@ -581,6 +582,8 @@ public class OrderBackVO {
private String descZh = "归属客户：%s 客户编号：%s";
@ApiModelProperty(value = "订单修改审批如果需要产生未分配客户经理异常时的异常说明")
private String descEn = "Customer: %s Customer No.: %s";
@ApiModelProperty(value = "订单修改审批如果需要产生未分配客户经理异常时的异常说明")
private String descFr = "Client: %s Client No.: %s";
@ApiModelProperty(value = "语言")
private Integer lang;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderManualExceptionBatchReqVO.java
View file @ 81ec0e30
......@@ -25,6 +25,9 @@ public class OrderManualExceptionBatchReqVO {
@ApiModelProperty(value = "转异-描述英文")
private String descEn;
@ApiModelProperty(value = "转异-描述法文")
private String descFr;
@ApiModelProperty(value = "转异-影像列表")
private List<String> exceptionUrls;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/OrderExceptionDescVO.java
View file @ 81ec0e30
......@@ -21,4 +21,6 @@ public class OrderExceptionDescVO {
@ApiModelProperty(value = "描述英文")
private String descEn;
@ApiModelProperty(value = "描述法文")
private String descFr;
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/additional/ChannelPackagingOverWeightAdditionalBo.java
View file @ 81ec0e30
......@@ -22,8 +22,11 @@ public class ChannelPackagingOverWeightAdditionalBo {
private String lineStartNameZh;
private String lineStartNameEn;
private String lineStartNameFr;
private String lineDestNameZh;
private String lineDesttNameEn;
private String lineDestNameEn;
private String lineDestNameFr;
/**
......@@ -33,6 +36,7 @@ public class ChannelPackagingOverWeightAdditionalBo {
private String channelNameZh;
private String channelNameEn;
private String channelNameFr;
/**
* 重量新值
......@@ -54,6 +58,7 @@ public class ChannelPackagingOverWeightAdditionalBo {
*/
private String packingTypeNameZh;
private String packingTypeNameEn;
private String packingTypeNameFr;
/**
......@@ -64,6 +69,7 @@ public class ChannelPackagingOverWeightAdditionalBo {
private String exceptionDescZh;
private String exceptionDescEn;
private String exceptionDescFr;
private boolean isMerged = false;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/additional/GoodsLineOverWeightAdditionalBo.java
View file @ 81ec0e30
......@@ -20,7 +20,7 @@ public class GoodsLineOverWeightAdditionalBo {
private String prodTitleZh;
private String prodTitleEn;
private String prodTitleFr;
/**
* 线路id
......@@ -29,8 +29,10 @@ public class GoodsLineOverWeightAdditionalBo {
private String lineStartNameZh;
private String lineStartNameEn;
private String lineStartNameFr;
private String lineDestNameZh;
private String lineDesttNameEn;
private String lineDestNameEn;
private String lineDestNameFr;
/**
......@@ -40,6 +42,7 @@ public class GoodsLineOverWeightAdditionalBo {
private String channelNameZh;
private String channelNameEn;
private String channelNameFr;
private BigDecimal weightSum;
......@@ -49,5 +52,6 @@ public class GoodsLineOverWeightAdditionalBo {
private String goodsLineWeightExceptionDescZh;
private String goodsLineWeightExceptionDescEn;
private String goodsLineWeightExceptionDescFr;
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderWarehouseAdjust/OrderWarehouseAdjustArrivedVO.java
View file @ 81ec0e30
......@@ -46,6 +46,8 @@ public class OrderWarehouseAdjustArrivedVO {
@ApiModelProperty(value = "转异-描述英文")
private String descEn;
@ApiModelProperty(value = "转异-描述法文")
private String descFr;
@ApiModelProperty(value = "异常附件")
private List<String> exceptionUrls;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderWarehouseIn/OrderItemFinishStockedReqVO.java
View file @ 81ec0e30
package cn.iocoder.yudao.module.order.vo.orderWarehouseIn;
import cn.iocoder.yudao.module.order.vo.orderLabel.OrderLabelDto;
import cn.iocoder.yudao.module.order.vo.orderLocation.OrderLocationCreateReqVO;
import cn.iocoder.yudao.module.order.vo.orderSpecialNeed.OrderSpecialNeedReceivableReqVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
......@@ -47,6 +43,9 @@ public class OrderItemFinishStockedReqVO {
@ApiModelProperty(value = "转异-描述英文")
private String descEn;
@ApiModelProperty(value = "转异-描述法文")
private String descFr;
@ApiModelProperty(value = "转异-影像列表")
private List<String> exceptionUrls;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderWarehouseIn/OrderWarehouseInFinishReqVO.java
View file @ 81ec0e30
......@@ -42,6 +42,9 @@ public class OrderWarehouseInFinishReqVO {
@ApiModelProperty(value = "转异-描述英文")
private String descEn;
@ApiModelProperty(value = "转异-描述法文")
private String descFr;
@ApiModelProperty(value = "转异-影像列表")
private List<String> exceptionUrls;
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxCabinetUnloadAbnormal/BoxCabinetUnloadAbnormalServiceImpl.java
View file @ 81ec0e30
package cn.iocoder.yudao.module.shipment.service.boxCabinetUnloadAbnormal;
import java.util.*;
import javax.annotation.Resource;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
import cn.iocoder.yudao.module.order.enums.OrderExceptionEnum;
......@@ -23,9 +22,11 @@ import cn.iocoder.yudao.module.shipment.vo.boxCabinetUnloadAbnormal.BoxCabinetUn
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import java.util.StringJoiner;
/**
* 卸柜异常 Service 实现类
......@@ -89,8 +90,10 @@ public class BoxCabinetUnloadAbnormalServiceImpl extends AbstractService<BoxCabi
.add(createReqVO.getProductNum() + unitDto.getLabel()).toString();
String descEn = new StringJoiner(", ").add(orderExceptionType.getEnValueDesc()).add(orderItemDO.getProdTitleEn())
.add(createReqVO.getProductNum() + " " + unitDto.getLabelEn()).toString();
String descFr = new StringJoiner(", ").add(orderExceptionType.getFrValueDesc()).add(orderItemDO.getProdTitleFr())
.add(createReqVO.getProductNum() + " " + unitDto.getLabelFr()).toString();
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).build());
orderExceptionCreateReqVO.setOrderExceptionDescVO(OrderExceptionDescVO.builder().descZh(descZh).descEn(descEn).descFr(descFr).build());
orderExceptionService.createOrderException(orderExceptionCreateReqVO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment