提交 51052772 作者: zhangqiliang

退货管理的导出采用发货表的数据

父级 21c9621e
...@@ -91,7 +91,7 @@ public class Contants { ...@@ -91,7 +91,7 @@ public class Contants {
public static final String export_reject_title = "序号,安装订单,产品名称,产品编码,物料类型,退货数量,申请人,退货原因,退回仓库,审核状态"; public static final String export_reject_title = "序号,安装订单,产品名称,产品编码,物料类型,退货数量,申请人,退货原因,退回仓库,审核状态";
public static final String export_reject_field = public static final String export_reject_field =
"id,installOrder,materialName,materialCode,materialCategory,quantity,accountName,reason,warehouseName,status"; "id,installOrder,materialName,materialCode,materialCategory,quantity,team,reason,arrivalWarehouse,status";
public static final String export_tauxiliaryMaterials_title = "序号,物料名称,物料编码,规格型号,计量单位,申请数量,申请人库存,申请状态,申请团队,物流单号,物流状态,收货状态,收件人,批准数量,申请时间"; public static final String export_tauxiliaryMaterials_title = "序号,物料名称,物料编码,规格型号,计量单位,申请数量,申请人库存,申请状态,申请团队,物流单号,物流状态,收货状态,收件人,批准数量,申请时间";
public static final String export_tauxiliaryMaterials_field = public static final String export_tauxiliaryMaterials_field =
......
...@@ -3,7 +3,9 @@ package com.starcharge.wios.export.impl; ...@@ -3,7 +3,9 @@ package com.starcharge.wios.export.impl;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.starcharge.wios.bo.SupplierBo; import com.starcharge.wios.bo.SupplierBo;
import com.starcharge.wios.dao.entity.Delivery;
import com.starcharge.wios.dao.entity.Reject; import com.starcharge.wios.dao.entity.Reject;
import com.starcharge.wios.dao.mappers.DeliveryMapper;
import com.starcharge.wios.dao.mappers.RejectMapper; import com.starcharge.wios.dao.mappers.RejectMapper;
import com.starcharge.wios.export.Export; import com.starcharge.wios.export.Export;
import com.starcharge.wios.service.SupplierService; import com.starcharge.wios.service.SupplierService;
...@@ -11,6 +13,7 @@ import com.starcharge.wios.vo.SupplierVo; ...@@ -11,6 +13,7 @@ import com.starcharge.wios.vo.SupplierVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
...@@ -20,20 +23,27 @@ import java.util.List; ...@@ -20,20 +23,27 @@ import java.util.List;
* @version [版本号, 2023年11月14日] * @version [版本号, 2023年11月14日]
*/ */
@Service @Service
public class RejectExport implements Export<Reject> { public class RejectExport implements Export<Delivery> {
@Autowired @Autowired
private RejectMapper rejectMapper; private DeliveryMapper deliveryMapper;
@Override @Override
public List<Reject> getExportList(String json) throws Exception { public List<Delivery> getExportList(String json) throws Exception {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
Reject condition = mapper.readValue(json, Reject.class); Delivery condition = mapper.readValue(json, Delivery.class);
List<Reject> list = rejectMapper.selectRejectList(condition); List<String> listStatus= Arrays.asList("已申请","已驳回","已通过","已关闭");
condition.setStatusList(listStatus);
int page = 1;
int pagecount = 10;
condition.setPage(page);
condition.setPagecount(pagecount);
List<Delivery> list = deliveryMapper.selectDeliveryList(condition);
int no = 1; int no = 1;
for (Reject vo : list) { for (Delivery vo : list) {
vo.setId(no++); vo.setId(no++);
vo.setQuantity(1);
} }
return list; return list;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论