ソースを参照

[update] 加入司机区域线路字段返回

miajio 2 週間 前
コミット
d65e35186a

+ 2 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/areastaff/fase/AreaStaffIdFace.java

@@ -10,4 +10,6 @@ public interface AreaStaffIdFace {
 
     void setAreaStaffName(String areaStaffName);
 
+    void setAreaChainName(String areaChain);
+
 }

+ 5 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/vo/DriverGoodsLossRecordVo.java

@@ -52,6 +52,11 @@ public class DriverGoodsLossRecordVo implements OperatorNameFace, AreaStaffIdFac
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 昨日在途数量
      */
     private Long yesterdayOnRouteNum;

+ 5 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/vo/DriverIntervalCargoDamageDetailVo.java

@@ -26,6 +26,11 @@ public class DriverIntervalCargoDamageDetailVo implements AreaStaffIdFace, Seria
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 上次剩余在途库存数
      */
     private Long lastRemainingOnRouteStock;

+ 5 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/vo/DriverRouteAccountRecordMainVo.java

@@ -33,6 +33,11 @@ public class DriverRouteAccountRecordMainVo implements AreaStaffIdFace, Serializ
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 仓库id
      */
     private Long warehouseId;

+ 1 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/areastaff/impl/AreaStaffServiceImpl.java

@@ -36,6 +36,7 @@ public class AreaStaffServiceImpl implements AreaStaffService {
             AreaStaffResponse areaStaffResponse = areaStaffMap.get(vo.getAreaStaffId());
             if (null != areaStaffResponse) {
                 vo.setAreaStaffName(areaStaffResponse.getEmployeeName());
+                vo.setAreaChainName(areaStaffResponse.getAreaChainName());
             }
         });
     }

+ 0 - 3
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverDailyCargoDamageController.java

@@ -36,9 +36,6 @@ public class DriverDailyCargoDamageController extends BaseController {
     private DriverGoodsLossRecordService driverGoodsLossRecordService;
 
     @Resource
-    private AreaStaffComponent areaStaffComponent;
-
-    @Resource
     private AreaStaffService areaStaffService;
 
     @Resource

+ 6 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/export/DriverRouteAccountRecordMainExport.java

@@ -18,6 +18,12 @@ public class DriverRouteAccountRecordMainExport implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 区域线路名称
+     */
+    @ExcelProperty("区域线路")
+    private String areaChainName;
+
+    /**
      * 区域员工名称
      */
     @ExcelProperty("区域员工名称")

+ 5 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverIntervalCargoDamageDetailResponse.java

@@ -25,6 +25,11 @@ public class DriverIntervalCargoDamageDetailResponse implements Serializable {
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 上次剩余在途库存数
      */
     private Long lastRemainingOnRouteStock;

+ 5 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverRouteAccountRecordMainResponse.java

@@ -33,6 +33,11 @@ public class DriverRouteAccountRecordMainResponse implements Serializable {
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 仓库id
      */
     private Long warehouseId;