发货管理和收货管理的导出功能

aaecdc2b · zhangqiliang · 936e531b · aaecdc2b · aaecdc2b · aaecdc2b
--- a/src/main/java/com/starcharge/wios/controller/RejectController.java
+++ b/src/main/java/com/starcharge/wios/controller/RejectController.java
@@ -129,14 +129,15 @@ public class RejectController {
    @PostMapping("/confirmReject")
    @ApiOperation("确认退货接口")
    @ParamsValidate
-    public BaseResponse<DeliveryUpdateDTO> confirmReject(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
+    public BaseResponse<Void> confirmReject(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
        //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);
+        //String token = SpringContextUtil.getToken();
        Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
        Map<String, String> params = new HashMap<String, String>();
        params.put("warehouseId",before.getArrivalWarehouseId());
        params.put("materialsCode",before.getMaterialCode());
-        //String token = SpringContextUtil.getToken();
+        String jsonStr = HttpClientUtils.post(url, params, "UTF-8", "UTF-8");
-        String jsonStr = HttpClientUtils.post(url, "<xml>" + XMLUtilsEx.serialize(params) + "</xml>", "UTF-8", "UTF-8");
+        System.out.println("外联数据"+jsonStr);
        JSONObject jsonObject=JSONObject.parseObject(jsonStr);
        String code=jsonObject.getString("code");
        if (StringUtil.isNullOrEmpty(code) || !"200".equals(code)){

--- a/src/main/java/com/starcharge/wios/export/Contants.java
+++ b/src/main/java/com/starcharge/wios/export/Contants.java
@@ -97,7 +97,9 @@ public class Contants {
    public static final String export_tauxiliaryMaterials_field =
            "id,materialName,materialCode,specification,measurementUnit,applyQuantity,currentySap,applyStatus,team,logisticOrder,logisticStatus,receivingStatus,recipents,approvedQuantity,applyTime";
    public static final String export_receive_title = "序号,安装订单号,产品名称,到货数量,产品批次,物料类别,到货仓库,收货人,收货时间,送货单";
    public static final String export_receive_field =
-            "id,installOrder,materialName,arrivalQuantity,productBatch,materialCategory,arrivalWarehouse,receiver,receivingTime,receivedOrder";
+            "id,installOrder,materialName,arrivalQuantity,productBatch,materialCategory,arrivalWarehouse,receiver,updatedTime,receivedOrder";
+    public static final String export_delivery_title = "序号,安装单号,物流单号,物料编码,物料名称,厂商,物料类型,物流状态,物流服务商";
+    public static final String export_delivery_field =
+            "id,installOrder,logisticOrder,materialCode,materialName,materialCompany,materialCategory,logisticStatus,logisticCompany";
 }
--- a/src/main/java/com/starcharge/wios/export/impl/DeliveryExport.java
+++ b/src/main/java/com/starcharge/wios/export/impl/DeliveryExport.java
+package com.starcharge.wios.export.impl;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.starcharge.wios.dao.entity.Delivery;
+import com.starcharge.wios.dao.mappers.DeliveryMapper;
+import com.starcharge.wios.export.Export;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import java.util.List;
+/**
+ * 发货管理导出
+ * 
+ * @author zhangqiliang
+ * @version [版本号, 2023年11月25日]
+ */
+@Service
+public class DeliveryExport implements Export<Delivery> {
+    @Autowired
+    private DeliveryMapper deliveryMapper;
+    @Override
+    public List<Delivery> getExportList(String json) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        Delivery condition = mapper.readValue(json, Delivery.class);
+        List<String> listLogisticStatus= Arrays.asList("已发货","已收货","退货已申请","退货已驳回","退货已通过","退货完成");
+        condition.setLogisticStatusList(listLogisticStatus);
+        List<Delivery> list = deliveryMapper.selectDeliveryList(condition);
+        int no = 1;
+        for (Delivery vo : list) {
+            vo.setId(no++);
+            vo.setQuantity(1);
+        }
+        return list;
+    }
+}
--- a/src/main/java/com/starcharge/wios/export/impl/ReceiveExport.java
+++ b/src/main/java/com/starcharge/wios/export/impl/ReceiveExport.java
@@ -2,14 +2,17 @@ package com.starcharge.wios.export.impl;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.starcharge.wios.dao.entity.Delivery;
 import com.starcharge.wios.dao.entity.Receivednote;
 import com.starcharge.wios.dao.entity.Reject;
+import com.starcharge.wios.dao.mappers.DeliveryMapper;
 import com.starcharge.wios.dao.mappers.ReceivednoteMapper;
 import com.starcharge.wios.dao.mappers.RejectMapper;
 import com.starcharge.wios.export.Export;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.Arrays;
 import java.util.List;
 /**
@@ -19,19 +22,21 @@ import java.util.List;
 * @version [版本号, 2023年11月17日]
 */
 @Service
-public class ReceiveExport implements Export<Receivednote> {
+public class ReceiveExport implements Export<Delivery> {
    @Autowired
-    private ReceivednoteMapper receivednoteMapper;
+    private DeliveryMapper deliveryMapper;
    @Override
-    public List<Receivednote> getExportList(String json) throws Exception {
+    public List<Delivery> getExportList(String json) throws Exception {
        ObjectMapper mapper = new ObjectMapper();
        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        Receivednote condition = mapper.readValue(json, Receivednote.class);
+        Delivery condition = mapper.readValue(json, Delivery.class);
-        List<Receivednote> list = receivednoteMapper.selectReceivedNoteList(condition);
+        List<String> listLogisticStatus= Arrays.asList("已发货","已收货","退货已申请","退货已驳回","退货已通过","退货完成");
+        condition.setLogisticStatusList(listLogisticStatus);
+        List<Delivery> list = deliveryMapper.selectDeliveryList(condition);
        int no = 1;
-        for (Receivednote vo : list) {
+        for (Delivery vo : list) {
            vo.setId(no++);
        }
        return list;

--- a/src/main/java/com/starcharge/wios/export/impl/RejectExport.java
+++ b/src/main/java/com/starcharge/wios/export/impl/RejectExport.java
@@ -33,12 +33,8 @@ public class RejectExport implements Export<Delivery> {
        ObjectMapper mapper = new ObjectMapper();
        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
        Delivery condition = mapper.readValue(json, Delivery.class);
-        List<String> listStatus= Arrays.asList("已申请","已驳回","已通过","已关闭");
+        List<String> listLogisticStatus= Arrays.asList("退货已申请","退货已驳回","退货已通过","退货完成");
-        condition.setLogisticStatusList(listStatus);
+        condition.setLogisticStatusList(listLogisticStatus);
-        int page = 1;
-        int pagecount = 10;
-        condition.setPage(page);
-        condition.setPagecount(pagecount);
        List<Delivery> list = deliveryMapper.selectDeliveryList(condition);
        int no = 1;
        for (Delivery vo : list) {