From f3813129107882ab77531a1d5f056824c401ca37 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 11:11:55 +0800
Subject: [PATCH] 采购相关问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 832bba2..3164da2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -182,22 +182,40 @@
return R.ok( erpProcurementService.detailProcurement(clinicSupplierId, user, id));
}
- @ApiOperation(value = "采购详情--仓库角色专用")
- @GetMapping(value = "/detailProcurementWarehouse/{id}")
- public R<DetailProcurementVO> detailProcurementWarehouse(@PathVariable String id) {
+
+ @ApiOperation(value = "采购详情--发货(仓库角色)")
+ @PostMapping(value = "/detailProcurementSend/{id}")
+ public R<?> detailProcurementSend(@PathVariable String id) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
String clinicSupplierId=null;
- if(roleType == 5){
- // 诊所
- TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
- .eq(TCrmClinic::getUserId, user.getUserId())
+ if(roleType == 4){
+ // 供应商
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, user.getUserId())
.last("LIMIT 1"));
- clinicSupplierId = crmClinic.getId();
+ clinicSupplierId=crmSupplier.getId();
}
-
- return R.ok( erpProcurementService.detailProcurementWarehouse(clinicSupplierId, user, id));
+ erpProcurementService.detailProcurementSend(clinicSupplierId, user, id);
+ return R.ok();
}
+
+// @ApiOperation(value = "采购详情--仓库角色专用")
+// @GetMapping(value = "/detailProcurementWarehouse/{id}")
+// public R<DetailProcurementVO> detailProcurementWarehouse(@PathVariable String id) {
+// SysUser user = tokenService.getLoginUser().getUser();
+// Integer roleType = user.getRoleType();
+// String clinicSupplierId=null;
+// if(roleType == 5){
+// // 诊所
+// TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+// .eq(TCrmClinic::getUserId, user.getUserId())
+// .last("LIMIT 1"));
+// clinicSupplierId = crmClinic.getId();
+// }
+//
+// return R.ok( erpProcurementService.detailProcurementWarehouse(clinicSupplierId, user, id));
+// }
@@ -216,7 +234,7 @@
clinicSupplierId = crmClinic.getId();
}
ArrayList<DetailProcurementNextVO> detailProcurementNextVOS = new ArrayList<>();
- List<TErpProcurement> list1 = erpProcurementService.list(new LambdaQueryWrapper<TErpProcurement>().eq(TErpProcurement::getStatus, 1).orderByDesc(TErpProcurement::getCreateTime));
+ List<TErpProcurement> list1 = erpProcurementService.list(new LambdaQueryWrapper<TErpProcurement>().eq(TErpProcurement::getClinicId, clinicSupplierId).eq(TErpProcurement::getStatus, 1).orderByDesc(TErpProcurement::getCreateTime));
if(list1.isEmpty()){
return R.ok(detailProcurementNextVOS);
}
@@ -364,6 +382,9 @@
tCrmChangePoints.setChangeValue(points);
crmChangePointsService.save(tCrmChangePoints);
+ branch.setUserPoints(branch.getUserPoints()+points);
+ crmBranchService.updateById(branch);
+
// 分佣
BigDecimal commission = branch.getMoneyCommission().divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_DOWN).multiply(payMoney).setScale(2, RoundingMode.HALF_UP);
@@ -389,6 +410,8 @@
tCrmChangePoints.setChangeReason(1);
tCrmChangePoints.setChangeValue(points);
crmChangePointsService.save(tCrmChangePoints);
+ salesperson.setUserPoints(salesperson.getUserPoints()+points);
+ crmSalespersonService.updateById(salesperson);
--
Gitblit v1.7.1