From 5d4ebe6d0b7dda230b19f4913bdeb60556b46678 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 18:33:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
index 4495912..3b3a210 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -1,19 +1,24 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.InventoryDto;
+import com.ruoyi.system.dto.OutboundGoodsDto;
import com.ruoyi.system.dto.WarehousingGoodsDto;
-import com.ruoyi.system.query.TErpGoodsQuery;
-import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
-import com.ruoyi.system.query.ValidityPeriodWarningQuery;
+import com.ruoyi.system.model.TCrmClinic;
+import com.ruoyi.system.model.TCrmSupplier;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.TCrmClinicService;
+import com.ruoyi.system.service.TCrmSupplierService;
+import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
-import com.ruoyi.system.vo.TErpGoodsVO;
-import com.ruoyi.system.vo.TErpGoodsWarehouseLastVO;
-import com.ruoyi.system.vo.TErpGoodsWarehouseRecordLastVO;
-import com.ruoyi.system.vo.ValidityPeriodWarningVo;
+import com.ruoyi.system.vo.*;
+import com.ruoyi.web.core.config.LakalaConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +26,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -36,12 +42,19 @@
public class TErpSupplierWarehousingController {
private final TErpSupplierWarehousingService erpSupplierWarehousingService;
+ private final TErpGoodsService erpGoodsService;
private final TokenService tokenService;
+ private final TCrmClinicService crmClinicService;
+ private final TCrmSupplierService crmSupplierService;
@Autowired
- public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TokenService tokenService) {
+ public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService,
+ TCrmClinicService crmClinicService,TCrmSupplierService crmSupplierService) {
this.erpSupplierWarehousingService = erpSupplierWarehousingService;
+ this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
+ this.crmClinicService = crmClinicService;
+ this.crmSupplierService = crmSupplierService;
}
@@ -52,7 +65,24 @@
@ApiOperation(value = "供应商获取库存分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
+
SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ if(roleType == 4){
+ // 供应商
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ query.setSupplierClinicId(crmSupplier.getId());
+ }
+ if(roleType == 5){
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ query.setSupplierClinicId(crmClinic.getId());
+ }
+
return R.ok(erpSupplierWarehousingService.pageList(query,user));
}
@@ -83,6 +113,14 @@
return R.ok();
}
+ @ApiOperation(value = "供应商库存出库")
+ @PostMapping(value = "/outbountGoods")
+ public R<?> outbountGoods(@RequestBody @Valid OutboundGoodsDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ erpSupplierWarehousingService.outbountGoods(dto,user);
+ return R.ok();
+ }
+
@ApiOperation(value = "有效期预警")
@PostMapping(value = "/validityPeriodWarning")
@@ -93,6 +131,52 @@
}
+
+
+
+ @ApiOperation(value = "供应商 盘点")
+ @PostMapping(value = "/pageInventoryList")
+ public R<PageInfo<PageInventoryListVo>> pageInventoryList(@RequestBody TErpInventoryQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpSupplierWarehousingService.pageInventoryList(query,user));
+ }
+
+ @ApiOperation(value = "供应商 盘点详情")
+ @GetMapping(value = "/detailInventory/{id}")
+ public R<List<InventoryDetailVo>> detailInventory(@PathVariable String id) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpSupplierWarehousingService.detailInventory(id,user));
+ }
+
+
+ @ApiOperation(value = "供应商 盘点 出库 商品选择")
+ @PostMapping(value = "/pageInventoryGoodsPageList")
+ public R<PageInfo<TErpGoodsInventoryVO>> pageInventoryGoodsPageList(@RequestBody @Valid TErpGoodsInventoryQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpGoodsService.pageInventoryGoodsPageList(query,user));
+ }
+ @ApiOperation(value = "有效期预警商品选择")
+ @GetMapping(value = "/pageInventoryGoodsList")
+ public R<List<TErpGoodsInventoryVO>> pageInventoryGoodsList(@RequestParam String warehouseId,@RequestParam(required = false)String batchId) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ List<TErpGoodsInventoryVO> tErpGoodsInventoryVOS = erpGoodsService.pageInventoryGoodsList(warehouseId, user);
+ if(batchId!=null && !"".equals(batchId)){
+ tErpGoodsInventoryVOS = tErpGoodsInventoryVOS.stream().filter(e->e.getId().equals(batchId)).collect(Collectors.toList());
+ }
+ return R.ok(tErpGoodsInventoryVOS);
+ }
+
+ @ApiOperation(value = "供应商 确认盘点")
+ @PostMapping(value = "/inventoryGoods")
+ public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ erpGoodsService.inventoryGoods(dto,user);
+ return R.ok();
+ }
+
+
+
+
}
--
Gitblit v1.7.1