diff --git a/src/main/java/com/starcharge/wios/dao/entity/Delivery.java b/src/main/java/com/starcharge/wios/dao/entity/Delivery.java index 6a1c618..051bc1a 100644 --- a/src/main/java/com/starcharge/wios/dao/entity/Delivery.java +++ b/src/main/java/com/starcharge/wios/dao/entity/Delivery.java @@ -257,6 +257,13 @@ public class Delivery extends PageVo implements Serializable { */ @ApiModelProperty(value = "车企单号") private String outOrderId; + /** + * 退货的物流单号 + * + * @mbg.generated + */ + @ApiModelProperty(value = "退货的物流单号") + private String rejectLogisticOrder; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml b/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml index f7740ee..e511e06 100644 --- a/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml +++ b/src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml @@ -96,7 +96,7 @@ id, delivery_order, install_order, product_batch, quantity, material_category, material_code, material_name, material_company, logistic_order, logistic_company, logistic_status, team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, arrival_warehouse, - arrival_warehouse_id, receiver,remarks,reject_material,reason,status,check_time,check_user,check_user_name,check_suggestion + arrival_warehouse_id, receiver,remarks,reject_material,reason,status,check_time,check_user,check_user_name,check_suggestion,reject_logistic_order </sql> <select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap"> @@ -155,7 +155,7 @@ t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.logistic_status, t.team, t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.arrival_warehouse, t.arrival_warehouse_id, t.receiver,t.remarks,t.reject_material,t.reason,t.status,t.check_time,t.check_user,t.check_user_name,t.check_suggestion, - e.out_order_id + e.out_order_id,t.reject_logistic_order from t_delivery t left join t_order e on e.id = t.install_order where t.id = #{id,jdbcType=INTEGER}