From ccda8b2733a2fabb8c23c062583b1437d6866379 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 09 十一月 2023 11:47:48 +0800
Subject: [PATCH] feat: 增加查询角色类
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 3b24f16..711d942 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -21,13 +21,11 @@
import javax.annotation.Resource;
import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @ClassName LWhFormProcureController
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
@@ -53,6 +51,8 @@
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Resource
private LWhProcureModelService lWhProcureModelService;
+ @Resource
+ private LOrgSupplierServiceImpl lOrgSupplierService;
/**
* @Description 鏂板
@@ -64,6 +64,9 @@
return ResponseValue.error("浠撳簱ID涓嶈兘涓虹┖");
}
BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String tenantId = sysTenantUser.getTenantId();
+ String tenantName = sysTenantUser.getTenantName();
// 鍙兘娣诲姞鏈満鏋勪粨搴撶殑杩涜揣鍗�
//??????
//
@@ -79,7 +82,9 @@
if (whFormProcureId == null) {
whFormProcureId = NumberGenerator.getLongSequenceNumber();
}
- long procureTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ long procureTime = DateUtils.getDateTimeNumber(param.getProcureTime());
+
+ Set<String> supplierList = new HashSet<>();
ArrayList<LWhFormProcureGoods> procureGoodList = new ArrayList<>();
ArrayList<LWhProcureModel> whProcureModeLlist = new ArrayList<>();
@@ -89,6 +94,12 @@
Long baseCategoryId = procureGoodT.getBaseCategoryId();
Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
String supplier = procureGoodT.getSupplier();
+ // 鍒ゆ柇褰撳墠渚涘簲鍟嗘槸鍚﹀凡瀛樺湪
+ if (!supplierList.contains(supplier) && !lOrgSupplierService.supplierIsContain(tenantId, supplier)) {
+ supplierList.add(supplier);
+ }
+
+
List<LWhProcureModelParams> models = procureGoodT.getModels();
if (CollectionUtils.isEmpty(models)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
@@ -120,6 +131,7 @@
if (tempGoodsInfo == null) {
return ResponseValue.error("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
}
+ String modelName = (String) tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
LWhProcureModel model = new LWhProcureModel();
@@ -128,6 +140,7 @@
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
+ model.setBaseGoodsModelsName(modelName);
model.setPrice(price);
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
@@ -142,7 +155,7 @@
// 鎻掑叆 閲囪喘鍗曠墿鍝併�怢_WH_FORM_PROCURE_GOODS銆�
LWhFormProcure lWhFormProcure = new LWhFormProcure();
lWhFormProcure.setId(whFormProcureId);
- lWhFormProcure.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.Procure_Warehouse.getValue(), 10));
+ lWhFormProcure.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse));
lWhFormProcure.setWarehouseId(warehouseId);
lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
lWhFormProcure.setBuyerId(currentUser.getId());
@@ -154,7 +167,18 @@
lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
int result = lWhFormProcureService.insert(lWhFormProcure);
- if (result > 0) return ResponseValue.success(1);
+
+ supplierList.forEach(supplier -> {
+ LOrgSupplier lOrgSupplier = new LOrgSupplier();
+ lOrgSupplier.setId(NumberGenerator.getLongSequenceNumber());
+ lOrgSupplier.setAgencyId(tenantId);
+ lOrgSupplier.setAgencyName(tenantName);
+ lOrgSupplier.setSupplier(supplier);
+ lOrgSupplierService.insert(lOrgSupplier);
+ });
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
--
Gitblit v1.9.1