[update] 未补货补货单列表导出加入补货单类型

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/menu/ReplenishOrderTypeEnum.java

@@ -0,0 +1,28 @@
+package com.yr.warehouse.admin.replenish.menu;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum ReplenishOrderTypeEnum {
+
+    REPLENISH(0, "补货单"),
+    INCREASE_REPLENISH(1, "增补单"),
+    MANY_REPLENISH(2, "多补单"),
+    REPLENISH_STOCKTAKING(3, "盘点单");
+
+    private final Integer code;
+
+    private final String desc;
+
+    public static String getDesc(Integer code) {
+        for (ReplenishOrderTypeEnum value : ReplenishOrderTypeEnum.values()) {
+            if (value.getCode().equals(code)) {
+                return value.getDesc();
+            }
+        }
+        return null;
+    }
+
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -408,6 +408,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
         }
         areaStaffService.buildAreaStaffName(resultVos);
         operatorBuildService.buildOperatorName(resultVos);
+
         List<DriverIntervalCargoDamageUnReplenishOrderExport> exports = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageUnReplenishOrderPageVoToExport(resultVos);
 
         String uri = exportClient.export(exports, "export/driver/interval/unReplenish", "区间货损记录未补货的补货单列表" + System.currentTimeMillis());

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/export/DriverIntervalCargoDamageUnReplenishOrderExport.java

@@ -56,7 +56,7 @@ public class DriverIntervalCargoDamageUnReplenishOrderExport  implements Seriali
      * 补货单类型
      */
     @ExcelProperty("补货单类型")
-    private Integer replenishType;
+    private String replenishTypeStr;
 
     /**
      * 补货员名称

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverIntervalCargoDamageMapStruct.java

@@ -3,6 +3,7 @@ package com.yr.warehouse.admin.web.driver.mapstruct;
 import com.yr.bluecat.common.entity.request.AdminUserRequest;
 import com.yr.warehouse.admin.driver.bo.*;
 import com.yr.warehouse.admin.driver.vo.*;
+import com.yr.warehouse.admin.replenish.menu.ReplenishOrderTypeEnum;
 import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageDetailExport;
 import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageUnReplenishOrderExport;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordDetailExport;
@@ -62,6 +63,30 @@ public interface DriverIntervalCargoDamageMapStruct {
 
     DriverIntervalCargoDamageUnReplenishOrderPageBo driverIntervalCargoDamageUnReplenishOrderExportRequestToBo(DriverIntervalCargoDamageUnReplenishOrderExportRequest request);
 
+    default DriverIntervalCargoDamageUnReplenishOrderExport driverIntervalCargoDamageUnReplenishOrderPageVoToExport(DriverIntervalCargoDamageUnReplenishOrderPageVo driverIntervalCargoDamageUnReplenishOrderPageVo) {
+        if (driverIntervalCargoDamageUnReplenishOrderPageVo == null) {
+            return null;
+        }
+
+        DriverIntervalCargoDamageUnReplenishOrderExport driverIntervalCargoDamageUnReplenishOrderExport = new DriverIntervalCargoDamageUnReplenishOrderExport();
+
+        driverIntervalCargoDamageUnReplenishOrderExport.setOrderNumber(driverIntervalCargoDamageUnReplenishOrderPageVo.getOrderNumber());
+        driverIntervalCargoDamageUnReplenishOrderExport.setOperatorName(driverIntervalCargoDamageUnReplenishOrderPageVo.getOperatorName());
+        driverIntervalCargoDamageUnReplenishOrderExport.setOperatorChainName(driverIntervalCargoDamageUnReplenishOrderPageVo.getOperatorChainName());
+        driverIntervalCargoDamageUnReplenishOrderExport.setDeviceNumber(driverIntervalCargoDamageUnReplenishOrderPageVo.getDeviceNumber());
+        driverIntervalCargoDamageUnReplenishOrderExport.setDeviceName(driverIntervalCargoDamageUnReplenishOrderPageVo.getDeviceName());
+        driverIntervalCargoDamageUnReplenishOrderExport.setDeviceModelName(driverIntervalCargoDamageUnReplenishOrderPageVo.getDeviceModelName());
+
+        String replenishTypeStr = ReplenishOrderTypeEnum.getDesc(driverIntervalCargoDamageUnReplenishOrderPageVo.getReplenishType());
+        driverIntervalCargoDamageUnReplenishOrderExport.setReplenishTypeStr(replenishTypeStr);
+        driverIntervalCargoDamageUnReplenishOrderExport.setAreaStaffName(driverIntervalCargoDamageUnReplenishOrderPageVo.getAreaStaffName());
+        driverIntervalCargoDamageUnReplenishOrderExport.setAreaChainName(driverIntervalCargoDamageUnReplenishOrderPageVo.getAreaChainName());
+        driverIntervalCargoDamageUnReplenishOrderExport.setUnReplenishedNum(driverIntervalCargoDamageUnReplenishOrderPageVo.getUnReplenishedNum());
+        driverIntervalCargoDamageUnReplenishOrderExport.setCreateTime(driverIntervalCargoDamageUnReplenishOrderPageVo.getCreateTime());
+
+        return driverIntervalCargoDamageUnReplenishOrderExport;
+    }
+
     List<DriverIntervalCargoDamageUnReplenishOrderExport> driverIntervalCargoDamageUnReplenishOrderPageVoToExport(List<DriverIntervalCargoDamageUnReplenishOrderPageVo> resultVos);
 
     DriverIntervalCargoDamageGoodsLossStatProfitPageBo driverIntervalCargoDamageGoodsLossStatProfitPageRequestToBo(DriverIntervalCargoDamageGoodsLossStatProfitPageRequest request);