Skip to content

W
wios
提交 541ee7a6 作者: zhangqiliang
操作

退货管理的导出表格和查询的列保持一致，新增和查询的多一个账号字段

父级 9be23755
正在显示 包含 58 行增加 和 27 行删除
src/main/java/com/starcharge/wios/dao/entity/Reject.java
...@@ -242,6 +242,20 @@ public class Reject extends PageVo implements Serializable { ...@@ -242,6 +242,20 @@ public class Reject extends PageVo implements Serializable {
*/ */
@ApiModelProperty(value = "物流状态") @ApiModelProperty(value = "物流状态")
private String logisticStatus; private String logisticStatus;
/**
* 账号id
*
* @mbg.generated
*/
@ApiModelProperty(value = "账号id")
private String accountId;
/**
* 申请人
*
* @mbg.generated
*/
@ApiModelProperty(value = "申请人")
private String accountName;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
src/main/java/com/starcharge/wios/dao/mappers/RejectMapper.xml
...@@ -96,32 +96,36 @@ ...@@ -96,32 +96,36 @@
<select id="selectRejectList" parameterType="com.starcharge.wios.dao.entity.Reject" resultMap="BaseResultMap"> <select id="selectRejectList" parameterType="com.starcharge.wios.dao.entity.Reject" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> t.id, t.reject_order, t.install_order, t.product_batch, t.quantity, t.material_category, t.material_code,
from t_reject t.material_name, t.material_company, t.logistic_order, t.logistic_company, t.warehouse_name,
t.warehouse_id, t.reason, t.status, t.check_time, t.check_user, t.check_user_name, t.check_suggestion,
t.isproduct, t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME,t.remarks,t.reject_material,wb.name accountName
from t_reject t
left join wb_account wb on t.account_id=wb.id
<where> <where>
<if test="rejectOrder != null and rejectOrder != ''"> and reject_order = #{rejectOrder}</if> <if test="rejectOrder != null and rejectOrder != ''"> and t.reject_order = #{rejectOrder}</if>
<if test="installOrder != null and installOrder != ''"> and install_order = #{installOrder}</if> <if test="installOrder != null and installOrder != ''"> and t.install_order = #{installOrder}</if>
<if test="productBatch != null and productBatch != ''"> and product_batch = #{productBatch}</if> <if test="productBatch != null and productBatch != ''"> and t.product_batch = #{productBatch}</if>
<if test="quantity != null "> and quantity = #{quantity}</if> <if test="quantity != null "> and t.quantity = #{quantity}</if>
<if test="materialCategory != null and materialCategory != ''"> and material_category = #{materialCategory}</if> <if test="materialCategory != null and materialCategory != ''"> and t.material_category = #{materialCategory}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if> <if test="materialCode != null and materialCode != ''"> and t.material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if> <if test="materialName != null and materialName != ''"> and t.material_name like concat('%', #{materialName}, '%')</if>
<if test="materialCompany != null and materialCompany != ''"> and material_company = #{materialCompany}</if> <if test="materialCompany != null and materialCompany != ''"> and t.material_company = #{materialCompany}</if>
<if test="logisticOrder != null and logisticOrder != ''"> and logistic_order = #{logisticOrder}</if> <if test="logisticOrder != null and logisticOrder != ''"> and t.logistic_order = #{logisticOrder}</if>
<if test="logisticCompany != null and logisticCompany != ''"> and logistic_company = #{logisticCompany}</if> <if test="logisticCompany != null and logisticCompany != ''"> and t.logistic_company = #{logisticCompany}</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if> <if test="warehouseName != null and warehouseName != ''"> and t.warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if> <if test="warehouseId != null "> and t.warehouse_id = #{warehouseId}</if>
<if test="reason != null and reason != ''"> and reason like concat('%', #{reason}, '%')</if> <if test="reason != null and reason != ''"> and t.reason like concat('%', #{reason}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and t.status = #{status}</if>
<if test="checkTime != null "> and check_time = #{checkTime}</if> <if test="checkTime != null "> and t.check_time = #{checkTime}</if>
<if test="checkUser != null and checkUser != ''"> and check_user = #{checkUser}</if> <if test="checkUser != null and checkUser != ''"> and t.check_user = #{checkUser}</if>
<if test="checkUserName != null and checkUserName != ''"> and check_user_name like concat('%', #{checkUserName}, '%')</if> <if test="checkUserName != null and checkUserName != ''"> and t.check_user_name like concat('%', #{checkUserName}, '%')</if>
<if test="checkSuggestion != null and checkSuggestion != ''"> and check_suggestion like concat('%', #{checkSuggestion}, '%')</if> <if test="checkSuggestion != null and checkSuggestion != ''"> and t.check_suggestion like concat('%', #{checkSuggestion}, '%')</if>
<if test="isproduct != null "> and isproduct = #{isproduct}</if> <if test="isproduct != null "> and t.isproduct = #{isproduct}</if>
<if test="createdBy != null and createdBy != ''"> and CREATED_BY = #{createdBy}</if> <if test="createdBy != null and createdBy != ''"> and t.CREATED_BY = #{createdBy}</if>
<if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if> <if test="createdTime != null "> and t.CREATED_TIME = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''"> and t.UPDATED_BY = #{updatedBy}</if>
<if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if> <if test="updatedTime != null "> and t.UPDATED_TIME = #{updatedTime}</if>
</where> </where>
</select> </select>
...@@ -261,6 +265,9 @@ ...@@ -261,6 +265,9 @@
<if test="rejectMaterial != null"> <if test="rejectMaterial != null">
reject_material, reject_material,
</if> </if>
<if test="accountId != null">
account_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="rejectOrder != null"> <if test="rejectOrder != null">
...@@ -338,6 +345,9 @@ ...@@ -338,6 +345,9 @@
<if test="rejectMaterial != null"> <if test="rejectMaterial != null">
#{rejectMaterial,jdbcType=VARCHAR}, #{rejectMaterial,jdbcType=VARCHAR},
</if> </if>
<if test="accountId != null">
#{accountId,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.starcharge.wios.dao.entity.RejectCriteria" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.RejectCriteria" resultType="java.lang.Long">
......
src/main/java/com/starcharge/wios/export/Contants.java
...@@ -88,8 +88,8 @@ public class Contants { ...@@ -88,8 +88,8 @@ public class Contants {
public static final String export_orderDetail_field = public static final String export_orderDetail_field =
"id,installType,orderType,itemName,itemBrand,itemModel,materialsCode,unit,qunatity,ratePrice,fee,hasPay,payName,payType,payTime,invoiceType,invoiceName,invoiceTime,invoiceNum"; "id,installType,orderType,itemName,itemBrand,itemModel,materialsCode,unit,qunatity,ratePrice,fee,hasPay,payName,payType,payTime,invoiceType,invoiceName,invoiceTime,invoiceNum";
public static final String export_reject_title = "退货号,退货单号,安装单号,产品批次,退货数量,物料类别,物料编码,物料名称,物料厂商,物流单号,物流服务商,退货仓库,退货仓库id,退货原因,退货状态,审批时间,审核人,审核人姓名,审核意见,是否产品或辅料,创建人,创建时间,更新人,更新时间,申请表,退货材料"; public static final String export_reject_title = "序号,安装订单,产品名称,产品编码,物料类型,退货数量,申请人,退货原因,退回仓库,审核状态";
public static final String export_reject_field = public static final String export_reject_field =
"id,rejectOrder,installOrder,productBatch,quantity,materialCategory,materialCode,materialName,materialCompany,logisticOrder,logisticCompany,warehouseName,warehouseId,reason,status,checkTime,checkUser,checkUserName,checkSuggestion,isproduct,createdBy,createdTime,updatedBy,updatedTime,remarks,rejectMaterial"; "id,installOrder,materialName,materialCode,materialCategory,quantity,accountName,reason,warehouseName,status";
} }
src/main/java/com/starcharge/wios/vo/RejectAddVo.java
...@@ -171,4 +171,11 @@ public class RejectAddVo { ...@@ -171,4 +171,11 @@ public class RejectAddVo {
*/ */
@ApiModelProperty(value = "退货材料") @ApiModelProperty(value = "退货材料")
private String rejectMaterial; private String rejectMaterial;
/**
* 账号id
*
* @mbg.generated
*/
@ApiModelProperty(value = "账号id")
private String accountId;
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论