新需求

PddServer/src/main/java/org/ta/pddserver/controller/OperationController.java

@@ -12,7 +12,7 @@ import org.ta.pdd.entity.LogOrderEntity;
 import org.ta.pdd.entity.LogOrderMailDetailEntity;
 import org.ta.pdd.entity.LogOrderMailDetailIoEntity;
 import org.ta.pddserver.config.PddAPIConfig;
-import org.ta.pddserver.model.api.request.InBoundRequest;
+import org.ta.pddserver.model.api.request.*;
 import org.ta.pddserver.model.enums.StatusEnum;
 import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
 import org.ta.pddserver.model.pddjy.request.PddServiceConsoInboundRequest;
@@ -23,9 +23,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-@RequestMapping("/operation")
 @Slf4j
 @RestController
+@RequestMapping("/operation")
+@RolesAllowed({"WORKER", "ADMIN"})
 public class OperationController {
 
     @Resource
@@ -44,7 +45,10 @@ public class OperationController {
     PackageDetailImpl packageDetailImpl;
     @Resource
     TempStorageImpl tempStorageImpl;
-
+    @Resource
+    LogsMailScanImpl logsMailScanImpl;
+    @Resource
+    OutboundRecordImpl outboundRecordImpl;
     /*入库*/
     @Operation(
             summary = "入库",
@@ -215,4 +219,32 @@ public class OperationController {
         return JsonResponse.generateLocalCommonSuccessResponse(true, "");
     }
 
+
+    /*未上架货物查看列表*/
+    @Operation(summary = "未上架货物查看",description = "",deprecated = false)
+    @PostMapping("/notListedStorageList")
+    public JSONObject notListedStorageList(HttpServletRequest request, @RequestBody StorageListVORequest param) {
+        return JsonResponse.generateLocalCommonSuccessResponse(storageImpl.notListedStorageList(param), "");
+    }
+
+    /*货物查看列表*/
+    @Operation(summary = "货架货物查看",description = "",deprecated = false)
+    @PostMapping("/storageListPage")
+    public JSONObject storageListPage(HttpServletRequest request, @RequestBody StorageListVORequest param) {
+        return JsonResponse.generateLocalCommonSuccessResponse(storageImpl.storageListPage(param), "");
+    }
+
+    /*查看扫码记录列表*/
+    @Operation(summary = "查看扫码记录列表",description = "",deprecated = false)
+    @PostMapping("/logsMailScanList")
+    public JSONObject logsMailScanList(HttpServletRequest request, @RequestBody LogsMailScanListVORequest param) {
+        return JsonResponse.generateLocalCommonSuccessResponse(logsMailScanImpl.logsMailScanList(param), "");
+    }
+
+    /*查看出库记录列表*/
+    @Operation(summary = "查看出库记录列表",description = "",deprecated = false)
+    @PostMapping("/outboundRecordList")
+    public JSONObject outboundRecordList(HttpServletRequest request, @RequestBody OutboundRecordRequest param) {
+        return JsonResponse.generateLocalCommonSuccessResponse(outboundRecordImpl.outboundRecordList(param), "");
+    }
 }

PddServer/src/main/java/org/ta/pddserver/mapper/LogsMailScanMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.ta.pdd.entity.LogsMailScanEntity;
+import org.ta.pddserver.model.api.request.LogsMailScanListVORequest;
 
 import java.util.List;
 
@@ -13,4 +14,8 @@ public interface LogsMailScanMapper extends BaseMapper<LogsMailScanEntity> {
 
     @Select("SELECT `author`, `created`, `action` FROM `logs_mail_scan` WHERE `mailNo` = #{mailNo}   ORDER BY `uid` DESC;")
     List<LogsMailScanEntity> selectByMailNo(@Param("mailNo") String mailNo);
+
+    @Select("SELECT uid,mailNo,created,author,action FROM `logs_mail_scan` WHERE `mailNo` = #{mailNo} ORDER BY `uid` DESC;")
+    List<LogsMailScanEntity> logsMailScanList(LogsMailScanListVORequest param);
+
 }

PddServer/src/main/java/org/ta/pddserver/mapper/OutboundRecordMapper.java

@@ -4,12 +4,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.ta.pdd.entity.LogsMailScanEntity;
 import org.ta.pdd.entity.OutboundRecordEntity;
+import org.ta.pddserver.model.api.request.LogsMailScanListVORequest;
+import org.ta.pddserver.model.api.request.OutboundRecordRequest;
+
+import java.util.List;
 
 @Mapper
 public interface OutboundRecordMapper extends BaseMapper<OutboundRecordEntity> {
 
-    @Select("SELECT * FROM `outbound_record` WHERE `mailNo` = #{mailNo};")
+    @Select("SELECT * FROM `outbound_record` WHERE (`mailNo` = #{mailNo} OR #{mailNo}='')  AND (`orderCode` = #{orderCode} OR #{orderCode}='')  AND `created` >= #{createdStart} AND `created` < #{createdEnd} ;")
     OutboundRecordEntity findByMailNo(@Param("mailNo") String mailNo);
 
+    @Select("SELECT uid,mailNo,orderCode,created,creator FROM `outbound_record` WHERE (`mailNo` = #{mailNo} OR #{mailNo}='')  AND (`orderCode` = #{orderCode} OR #{orderCode}='')  AND `created` >= #{createdStart} AND `created` < #{createdEnd}  ORDER BY `uid` DESC;")
+    List<OutboundRecordEntity> outboundRecordList(OutboundRecordRequest param);
 }
+

PddServer/src/main/java/org/ta/pddserver/mapper/StorageMapper.java

@@ -3,8 +3,12 @@ package org.ta.pddserver.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.*;
 import org.ta.pdd.entity.StorageEntity;
+import org.ta.pddserver.model.api.request.StorageListRequest;
+import org.ta.pddserver.model.api.request.StorageListVORequest;
+import org.ta.pddserver.model.api.request.UnpackNoticeListRequest;
 import org.ta.pddserver.model.api.response.StorageListResponse;
 import org.ta.pddserver.model.api.response.StorageResponse;
+import org.ta.pddserver.model.api.response.UnpackNoticeListResponse;
 
 import java.util.List;
 
@@ -46,4 +50,13 @@ public interface StorageMapper extends BaseMapper<StorageEntity> {
 
     @Select("SELECT COUNT(*) FROM `storage` WHERE `place` IS NOT NULL;")
     Long countOned();
+
+    @Select("SELECT uid,mailNo,code,place,created,logisticsOrderCode,num,total,buyerCode FROM `storage` WHERE  place IS NULL AND (`mailNo` = #{mailNo} OR #{mailNo}='')  AND (`code` = #{code} OR #{code}='') ORDER BY `uid` DESC;")
+    List<StorageEntity> notListedStorageList(StorageListVORequest param);
+
+    @Select("SELECT count(`uid`) FROM `storage` WHERE (`mailNo` = #{mailNo} OR #{mailNo}='')  AND (`code` = #{code} OR #{code}='')")
+    Integer countUsableStorageListPage(StorageListVORequest param);
+
+    @Select("SELECT uid,mailNo,code,place,created,logisticsOrderCode,num,total,buyerCode FROM `storage` WHERE (`mailNo` = #{mailNo} OR #{mailNo}='')  AND (`code` = #{code} OR #{code}='') ORDER BY `uid` DESC LIMIT #{offset}, #{size};")
+    List<StorageEntity> getStorageListPage(StorageListVORequest param);
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/LogsMailScanListVORequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class LogsMailScanListVORequest {
+    private String mailNo;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/OutboundRecordRequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class OutboundRecordRequest {
+    private String mailNo;
+    private String orderCode;
+    private String createdStart;
+    private String createdEnd;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/StorageListVORequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class StorageListVORequest  extends PageTool {
+    private String mailNo;
+    private String code;
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/LogsMailScanImpl.java

@@ -6,10 +6,15 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.ta.pdd.entity.LogsMailScanEntity;
+import org.ta.pdd.entity.StorageEntity;
 import org.ta.pddserver.mapper.LogsMailScanMapper;
+import org.ta.pddserver.model.api.request.LogsMailScanListVORequest;
+import org.ta.pddserver.model.api.request.StorageListVORequest;
 import org.ta.pddserver.service.LogsMailScanService;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class LogsMailScanImpl extends ServiceImpl<LogsMailScanMapper, LogsMailScanEntity> implements LogsMailScanService {
@@ -27,4 +32,11 @@ public class LogsMailScanImpl extends ServiceImpl<LogsMailScanMapper, LogsMailSc
     public List<LogsMailScanEntity> getByMail(String mailNo) {
         return this.baseMapper.selectByMailNo(mailNo);
     }
+
+    public Map<String, Object> logsMailScanList(LogsMailScanListVORequest param) {
+        List<LogsMailScanEntity> list = baseMapper.logsMailScanList(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", list);
+        return map;
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/OutboundRecordImpl.java

@@ -3,10 +3,17 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.ta.pdd.entity.LogsMailScanEntity;
 import org.ta.pdd.entity.OutboundRecordEntity;
 import org.ta.pddserver.mapper.OutboundRecordMapper;
+import org.ta.pddserver.model.api.request.LogsMailScanListVORequest;
+import org.ta.pddserver.model.api.request.OutboundRecordRequest;
 import org.ta.pddserver.service.OutboundRecordService;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 @Service
 public class OutboundRecordImpl extends ServiceImpl<OutboundRecordMapper, OutboundRecordEntity> implements OutboundRecordService {
@@ -15,4 +22,11 @@ public class OutboundRecordImpl extends ServiceImpl<OutboundRecordMapper, Outbou
     public OutboundRecordEntity getByMailNo(String mailNo) {
         return this.baseMapper.findByMailNo(mailNo);
     }
+
+    public Map<String, Object> outboundRecordList(OutboundRecordRequest param) {
+        List<OutboundRecordEntity> list = baseMapper.outboundRecordList(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", list);
+        return map;
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/StorageImpl.java

@@ -5,8 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pdd.entity.StorageEntity;
 import org.ta.pddserver.mapper.StorageMapper;
+import org.ta.pddserver.model.api.request.LogOrderMailDetailListRequest;
+import org.ta.pddserver.model.api.request.StorageListRequest;
+import org.ta.pddserver.model.api.request.StorageListVORequest;
+import org.ta.pddserver.model.api.request.UnpackNoticeListRequest;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
 import org.ta.pddserver.model.api.response.StorageListResponse;
 import org.ta.pddserver.model.api.response.StorageResponse;
+import org.ta.pddserver.model.api.response.UnpackNoticeListResponse;
 import org.ta.pddserver.service.StorageService;
 
 import java.util.HashMap;
@@ -91,4 +97,23 @@ public class StorageImpl extends ServiceImpl<StorageMapper, StorageEntity> imple
     public Long countOned() {
         return this.baseMapper.countOned();
     }
+
+    public Map<String, Object> notListedStorageList(StorageListVORequest param) {
+        List<StorageEntity> list = baseMapper.notListedStorageList(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", list);
+        return map;
+    }
+
+    public Map<String, Object> storageListPage(StorageListVORequest param) {
+        Integer count = baseMapper.countUsableStorageListPage(param);
+        param.checkPage(count,20);
+        List<StorageEntity> list = baseMapper.getStorageListPage(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", count);
+        map.put("list", list);
+        map.put("page", param.getPage());
+        return map;
+    }
+
 }
\ No newline at end of file