仓库修改

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/InssServiceCmd.java

@@ -33,11 +33,11 @@ public enum InssServiceCmd implements SignServiceCommand {
     APP4PINBLOCK("OBE-IC 卡口令（PIN）解锁申请接口", "App4PinBlock", VfjApp4PinBlockRequest.class),
     CONFIRM4PINBLOCK("OBE-IC 卡口令（PIN）解锁申请接口", "Confirm4PinBlock", VfjConfirm4PinBlockRequest.class),
     QRYCARDBATCH("卡片发行批次列表查询", "QryCardBatch", VfjQryCardBatchRequest.class),
-    QRYCARDS("卡片发行批次列表查询", "QryCards", VfjQryCardsRequest.class),
+    QRYCARDS("卡片一发列表查询", "QryCards", VfjQryCardsRequest.class),
     QRYSMOBUBATCH("OBU发行批次列表查询", "QrySmObuBatch", VfjQrySmObuBatchRequest.class),
-    QUERYGMOBUS("双片国密OBU发行批次列表查询", "QueryGmobus", VfjQueryGmobusRequest.class),
-    QUERYSCOBUS("单片OBU发行批次列表查询", "QueryScobus", VfjQueryScobusRequest.class),
-    QUERYTRIDESOBUS("DESOBU发行批次列表查询", "QueryTriDesObus", VfjQueryTriDesObusRequest.class),
+    QUERYGMOBUS("双片国密OBU一发列表查询", "QueryGmobus", VfjQueryGmobusRequest.class),
+    QUERYSCOBUS("单片OBU一发列表查询", "QueryScobus", VfjQueryScobusRequest.class),
+    QUERYTRIDESOBUS("DESOBU一发列表查询", "QueryTriDesObus", VfjQueryTriDesObusRequest.class),
     ;
 
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/card/InvwCardDetailsController.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
  * @version: 1.0
  */
 
-@Api(tags = {"卡设备管理"})
+@Api(tags = {"006-卡设备管理"})
 @RestController
 @RequestMapping("/api/cardDetails")
 public class InvwCardDetailsController extends MyValidController {
@@ -36,37 +36,37 @@ public class InvwCardDetailsController extends MyValidController {
     @Autowired
     private InvwCardDetailsManager manager;
 
-    @ApiOperation(value = "卡设备分页查询")
+    @ApiOperation(value = "01-卡设备分页查询")
     @PostMapping("/page")
     public ApiResponse<Pagination> page(@Valid @RequestBody InvwCardDetailsPageRequestDTO dto) throws ServiceHandleException {
         return ApiResponse.of(manager.page(dto));
     }
 
-    @ApiOperation(value = "移除设备")
+    @ApiOperation(value = "02-移除设备")
     @PostMapping("/remove")
     public ApiResponse<InvwCardDetailsRemoveResponseDTO> remove(@Valid @RequestBody InvwCardDetailsRemoveRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.remove(dto));
     }
 
-    @ApiOperation(value = "报损")
+    @ApiOperation(value = "03-报损")
     @PostMapping("/breakage")
     public ApiResponse<InvwCardDetailsBreakageResponseDTO> breakage(@Valid @RequestBody InvwCardDetailsBreakageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.breakage(dto));
     }
 
-    @ApiOperation(value = "查看详情")
+    @ApiOperation(value = "04-查看详情")
     @PostMapping("/view")
     public ApiResponse<InvwCardDetailsViewResponseDTO> view(@Valid @RequestBody InvwCardDetailsViewRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.view(dto));
     }
 
-    @ApiOperation(value = "导出")
+    @ApiOperation(value = "05-导出")
     @PostMapping("/export")
     public ApiResponse<CommExcelFileResponseDTO> export(@Valid @RequestBody InvwCardDetailsExportRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.export(dto));
     }
 
-    @ApiOperation(value = "查看一发卡信息")
+    @ApiOperation(value = "06-查看一发卡信息")
     @PostMapping("/queryCard")
     public ApiResponse<InvwObuDetailsQueryCardResponseDTO> queryCard(@Valid @RequestBody InvwObuDetailsQueryCardRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.queryCard(dto));

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/card/InvwQryCardsController.java

@@ -26,7 +26,7 @@ public class InvwQryCardsController extends MyValidController {
     @Autowired
     private InvwQryCardsManager manager;
 
-    @ApiOperation(value = "01-卡片一行分页")
+    @ApiOperation(value = "01-卡片一发分页")
     @PostMapping("/page")
     public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryCardsPageRequestDTO req) {
         return ApiResponse.of(manager.page(req));

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/enter/InvwEnterApplyController.java

@@ -24,7 +24,7 @@ import javax.validation.Valid;
  * @email: huminghao@mail.taiji.com.cn
  * @version: 1.0
  */
-@Api(tags = {"入库管理"})
+@Api(tags = {"007-入库管理"})
 @RestController
 @RequestMapping("/api/enterApply")
 class InvwEnterApplyController extends MyValidController {
@@ -32,50 +32,50 @@ class InvwEnterApplyController extends MyValidController {
     @Autowired
     private InvwEnterApplyManager manager;
 
-    @ApiOperation(value = "入库申请分页查询")
+    @ApiOperation(value = "01-入库申请分页查询")
     @PostMapping("/page")
     public ApiResponse<Pagination> page(@Valid @RequestBody InvwEnterApplyPageRequestDTO req) throws ServiceHandleException {
         return ApiResponse.of(manager.page(req));
     }
 
-    @ApiOperation("入库提交申请")
+    @ApiOperation("02-入库提交申请")
     @PostMapping("/apply")
     public ApiResponse<InvwEnterApplyAddResponseDTO> apply(@Valid @RequestBody InvwEnterApplyAddRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.apply(dto)).setMessage("入库申请提交成功");
     }
 
-    @ApiOperation("入库申请信息详情")
+    @ApiOperation("03-入库申请信息详情")
     @PostMapping("/view")
     public ApiResponse<InvwEnterApplyViewResponseDTO> view(@Valid @RequestBody InvwEnterApplyViewRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.view(dto)).setMessage("入库申请信息详情查询完成");
     }
 
-    @ApiOperation("入库申请信息修改提交")
+    @ApiOperation("04-入库申请信息修改提交")
     @PostMapping("/update")
     public ApiResponse<InvwEnterApplyUpdateResponseDTO> update(@Valid @RequestBody InvwEnterApplyUpdateRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.update(dto)).setMessage("入库申请信息修改成功");
     }
 
 
-    @ApiOperation("确认入库")
+    @ApiOperation("05-确认入库")
     @PostMapping("/confirm")
     public ApiResponse<InvwEnterApplyConfirmResponseDTO> confirm(@Valid @RequestBody InvwEnterApplyConfirmRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.confirm(dto)).setMessage("确认入库提交成功");
     }
 
-    @ApiOperation("取消入库")
+    @ApiOperation("06-取消入库")
     @PostMapping("/cancel")
     public ApiResponse<InvwEnterApplyCancelResponseDTO> cancel(@Valid @RequestBody InvwEnterApplyCancelRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.cancel(dto)).setMessage("取消入库提交成功");
     }
 
-    @ApiOperation("号段校验")
+    @ApiOperation("07-号段校验")
     @PostMapping("/codeValid")
     public ApiResponse<InvwEnterApplyCodeValidResponseDTO> codeValid(@Valid @RequestBody InvwEnterApplyCodeValidRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.codeValid(dto)).setMessage("号段校验完成");
     }
 
-    @ApiOperation("解析excel获取号段")
+    @ApiOperation("08-解析excel获取号段")
     @PostMapping("/parseExcel")
     public ApiResponse<InvwEnterApplyParseExcelResponseDTO> parseExcel(@Valid @RequestBody InvwEnterApplyParseExcelRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.parseExcel(dto)).setMessage("excel数据输出完成");

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/obu/InvwObuDetailsController.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
  * @version: 1.0
  */
 
-@Api(tags = {"签设备管理"})
+@Api(tags = {"006-签设备管理"})
 @RestController
 @RequestMapping("/api/obuDetails")
 public class InvwObuDetailsController extends MyValidController {
@@ -36,37 +36,37 @@ public class InvwObuDetailsController extends MyValidController {
     @Autowired
     private InvwObuDetailsManager manager;
 
-    @ApiOperation(value = "签设备分页查询")
+    @ApiOperation(value = "01-签设备分页查询")
     @PostMapping("/page")
     public ApiResponse<Pagination> page(@Valid @RequestBody InvwObuDetailsPageRequestDTO dto) throws ServiceHandleException {
         return ApiResponse.of(manager.page(dto));
     }
 
-    @ApiOperation(value = "移除设备")
+    @ApiOperation(value = "02-移除设备")
     @PostMapping("/remove")
     public ApiResponse<InvwObuDetailsRemoveResponseDTO> remove(@Valid @RequestBody InvwObuDetailsRemoveRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.remove(dto));
     }
 
-    @ApiOperation(value = "报损")
+    @ApiOperation(value = "03-报损")
     @PostMapping("/breakage")
     public ApiResponse<InvwObuDetailsBreakageResponseDTO> breakage(@Valid @RequestBody InvwObuDetailsBreakageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.breakage(dto));
     }
 
-    @ApiOperation(value = "查看详情")
+    @ApiOperation(value = "04-查看详情")
     @PostMapping("/view")
     public ApiResponse<InvwObuDetailsViewResponseDTO> view(@Valid @RequestBody InvwObuDetailsViewRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.view(dto));
     }
 
-    @ApiOperation(value = "导出")
+    @ApiOperation(value = "05-导出")
     @PostMapping("/export")
     public ApiResponse<CommExcelFileResponseDTO> export(@Valid @RequestBody InvwObuDetailsExportRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.export(dto));
     }
 
-    @ApiOperation(value = "查看一发签信息")
+    @ApiOperation(value = "06-查看一发签信息")
     @PostMapping("/queryObu")
     public ApiResponse<InvwObuDetailsQueryObuResponseDTO> queryObu(@Valid @RequestBody InvwObuDetailsQueryObuRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.queryObu(dto));

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/obu/InvwQryObusController.java

@@ -26,7 +26,7 @@ public class InvwQryObusController extends MyValidController {
     @Autowired
     private InvwQryObusManager manager;
 
-    @ApiOperation(value = "01-OBU发行批次分页")
+    @ApiOperation(value = "01-OBU一发分页")
     @PostMapping("/page")
     public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryObusPageRequestDTO req) {
         return ApiResponse.of(manager.page(req));

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/reback/InvwRebackController.java

@@ -19,7 +19,7 @@ import cn.com.taiji.invw.manager.warehouse.InvwWarehouseManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@Api(tags = {"007-回收管理"})
+@Api(tags = {"009-回收管理"})
 @RestController
 @RequestMapping("/api/reback")
 public class InvwRebackController extends MyValidController {

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/warehouse/InvwWarehouseController.java

@@ -26,7 +26,7 @@ public class InvwWarehouseController extends MyValidController {
 
     @ApiOperation(value = "01-仓库分页")
     @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody InvwWarehousePageRequestDTO req) {
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwWarehousePageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.page(req));
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardsManagerImpl.java

@@ -57,7 +57,7 @@ public class InvwQryCardsManagerImpl extends AbstractCommManager implements Invw
                 }).collect(Collectors.toList());
 
         // 生成excel文件
-        String excelName = "卡片一行";
+        String excelName = "卡片一发";
         File file = null;
         try {
             file = File.createTempFile("temp_"+excelName, ".xlsx");

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManagerImpl.java

@@ -84,7 +84,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
             }
 
             // 读取文件数据
-            List<InvwStocktakingInfoRemoveModel> models = EasyExcelUtil.readExcelColToModelList(file, InvwStocktakingInfoRemoveModel.class, 0);
+            List<InvwStocktakingInfoRemoveModel> models = EasyExcelUtil.readExcelColToModelList(file, InvwStocktakingInfoRemoveModel.class, 1);
             if (models.isEmpty()) {
                 throw new ManagerException("导入文件为空");
             }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/transfer/InvwTransferApplyManagerImpl.java

@@ -19,6 +19,7 @@ import cn.com.taiji.invw.manager.AbstractInvwManager;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyCommModel;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyDetailsModel;
 import cn.com.taiji.invw.tools.GenerateNoUtil;
+import cn.hutool.core.io.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -186,12 +187,16 @@ public class InvwTransferApplyManagerImpl extends AbstractInvwManager implements
         //  获取导入文件
         File file = minioUtil.getFileByUrl(req.getFileUrl());
         // 读取文件数据
-        List<InvwTransferApplyDetailsModel> models = EasyExcelUtil.readExcelColToModelList(file, InvwTransferApplyDetailsModel.class, 0);
+        List<InvwTransferApplyDetailsModel> models = EasyExcelUtil.readExcelColToModelList(file, InvwTransferApplyDetailsModel.class, 1);
         if (models.size() == 0) {
             throw new ManagerException("导入文件为空");
         }
         InvwTransferApplyImportResponseDTO response = new InvwTransferApplyImportResponseDTO();
         response.setTransferDetails(models);
+        // 删除文件
+        if (file != null && file.exists()) {
+            FileUtil.del(file);
+        }
         return response;
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManager.java

@@ -1,11 +1,12 @@
 package cn.com.taiji.invw.manager.warehouse;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.invw.dto.warehouse.*;
 
 public interface InvwWarehouseManager {
-    Pagination page(InvwWarehousePageRequestDTO request);
+    Pagination page(InvwWarehousePageRequestDTO request) throws ServiceHandleException, ManagerException;
 
     void add(InvwWarehouseAddRequestDTO req) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -1,14 +1,17 @@
 package cn.com.taiji.invw.manager.warehouse;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.model.dao.ResultConverter;
 import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
+import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwObuDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwWarehouseRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.invw.InvwWarehousePageRequest;
 import cn.com.taiji.invw.dto.warehouse.*;
 import cn.com.taiji.invw.manager.AbstractInvwManager;
@@ -16,6 +19,7 @@ import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -30,11 +34,21 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
     private InvwObuDetailsRepo obuDetailsRepo;
     @Autowired
     private InvwCardDetailsRepo cardDetailsRepo;
+    @Autowired
+    private StaffRepo staffRepo;
 
     @Override
-    public Pagination page(InvwWarehousePageRequestDTO request) {
+    public Pagination page(InvwWarehousePageRequestDTO request) throws ManagerException {
         InvwWarehousePageRequest req = new InvwWarehousePageRequest();
         BeanUtils.copyProperties(request, req);
+        Staff staff = staffRepo.findByStaffId(request.getStaffId());
+        if (staff == null) throw new ManagerException("员工非法！");
+        // 如果不是超级管理员，只能查询本渠道的仓库
+        if(!"SUPER_MANAGER".equals(staff.getIdentityType())){
+            String agencyId = findAgencyIdByToken(request.getAccessToken());
+            if (!StringUtils.hasText(agencyId)) throw new ManagerException("渠道获取失败！");
+            req.setAgencyId(agencyId);
+        }
         return warehouseRepo.page(req).convertResult(this::convert);
     }
 
@@ -61,9 +75,8 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
         if (StringTools.hasText(req.getWarehouseChannelId())) {
             warehouse.setChannelId(req.getWarehouseChannelId());
         }
-        System.out.println("warehouse:"+warehouse);
         warehouseRepo.save(warehouse);
-//        persistOperateLog(OperateType.WAREHOUSE_ADD, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库新增");
+        persistOperateLog(OperateType.WAREHOUSE_ADD, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库新增");
     }
 
     public String generateCode(InvwWarehouse parentWarehouse, int level) throws ManagerException {
@@ -319,15 +332,15 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
 
 
     public InvwWarehousePageResponseDTO convert(InvwWarehouse warehouse) {
-        InvwWarehousePageResponseDTO vo = new InvwWarehousePageResponseDTO();
-        vo.setWarehouse(warehouse);
+        InvwWarehousePageResponseDTO response = new InvwWarehousePageResponseDTO();
+        response.setWarehouse(warehouse);
         String parentId = warehouse.getParentId();
         // 查询父级仓库
         if (StringTools.hasText(parentId)) {
             InvwWarehouse parentWarehouse = warehouseRepo.findById(parentId).orElse(null);
-            vo.setParentWarehouse(parentWarehouse);
+            response.setParentWarehouse(parentWarehouse);
         }
-        return vo;
+        return response;
     }
 
     public static void main(String[] args) {