From 6cfff55d44314e88fefd6e3adb290ec16b303f89 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期五, 05 一月 2024 10:42:53 +0800
Subject: [PATCH] 1、供产品导数据临时用(用户，机构，部门，仓库，库管员 可删) 2、选择库管员增加过滤参数
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 20a94db..1b490e4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -5,6 +5,9 @@
import java.util.List;
import java.util.stream.Collectors;
+import com.consum.base.service.FinSysTenantService;
+import com.consum.model.po.FinSysTenant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -40,12 +43,17 @@
@Api(value = "浠撳簱绠＄悊", tags = "浠撳簱绠＄悊")
@RestController
@RequestMapping("/pc/base/warehouse")
+@Slf4j
public class BaseWarehouseController extends BaseController {
@Autowired
private BaseWarehouseService baseWarehouseService;
+
@Autowired
private LWhGoodsService lWhGoodsService;
+
+ @Autowired
+ private FinSysTenantService finSysTenantService;
/**
* @Description 鏂板
@@ -76,6 +84,67 @@
}
return ResponseValue.error("鏂板澶辫触锛�");
}
+
+ // 渚涗骇鍝佸鏁版嵁涓存椂鐢�(鍙垹)
+ public String add1(BaseWarehouseParam param) {
+ BaseWarehouseParam param2 = new BaseWarehouseParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
+ if (StringUtils.isEmpty(param.getWarehouseName())) {
+ return "浠撳簱鍚嶇О涓虹┖";
+ }
+ Long agencyId = param.getAgencyId();
+ BaseWarehouse baseWarehouse = new BaseWarehouse();
+ baseWarehouse.setAgencyId(agencyId);
+ List<BaseWarehouse> select = baseWarehouseService.select(baseWarehouse);
+ if (!CollectionUtils.isEmpty(select)) {
+ return "璇ユ満鏋勫凡鏈変粨搴撲笉鑳界户缁柊澧烇紒";
+ }
+ int result = baseWarehouseService.add(param);
+ if (result > 0) {
+ return "1";
+ }
+ return "鏂板澶辫触锛�";
+ }
+
+ //渚涗骇鍝佸鏁版嵁涓存椂鐢�(鍙垹)
+ //@PostMapping("/addCk")
+ public String addCk() {
+ int ok = 0;
+ int isNull = 0;
+ int bnxz = 0;
+ int err = 0;
+ // 鏌ヨ鎵�鏈夌殑鏈烘瀯
+ FinSysTenant finSysTenant = new FinSysTenant();
+ List<FinSysTenant> finSysTenants = finSysTenantService.selectAll(finSysTenant);
+ for (FinSysTenant fst : finSysTenants) {
+ // 缁勮浠撳簱鏁版嵁
+ BaseWarehouseParam baseWarehouseParam = new BaseWarehouseParam();
+ baseWarehouseParam.setWarehouseName(fst.getName() + "浠撳簱");
+ baseWarehouseParam.setAdress("");
+ baseWarehouseParam.setAgencyId(fst.getId());
+ baseWarehouseParam.setClassificationCode("29");
+ baseWarehouseParam.setStates(1);
+ // 璋冪敤鍘熸湰鐨勬柊澧炴帴鍙ｆ柊澧炰粨搴�
+ String resSta = add1(baseWarehouseParam);
+ if("1".equals(resSta)){
+ ok++;
+ }else if("浠撳簱鍚嶇О涓虹┖".equals(resSta)){
+ isNull++;
+ }else if("璇ユ満鏋勫凡鏈変粨搴撲笉鑳界户缁柊澧烇紒".equals(resSta)){
+ bnxz++;
+ }else if("鏂板澶辫触锛�".equals(resSta)){
+ err++;
+ }
+ }
+ log.info("ok:"+ok);
+ log.info("isNull:"+isNull);
+ log.info("bnxz:"+bnxz);
+ log.info("err:"+err);
+ return "鏂板浠撳簱..."+"##ok:"+ok+"##isNull:"+isNull+"##bnxz:"+bnxz+"##err:"+err;
+ }
+
/**
* @Description 浠撳簱鍒楄〃鏌ヨ
@@ -186,7 +255,7 @@
@ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
@ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
- dataType = "WarehouseQry", paramType = "query")})
+ dataType = "WarehouseQry", paramType = "query")})
@GetMapping("/select/number")
public ResponseValue selectNumber() {
WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
@@ -212,7 +281,7 @@
@ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
@ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
- dataType = "WarehouseQry", paramType = "query")})
+ dataType = "WarehouseQry", paramType = "query")})
@GetMapping("/select/in/warehouse/num")
public ResponseValue selectAllNumber() {
WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
@@ -222,7 +291,7 @@
Long agencyId = warehouseQry.getAgencyId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
+ baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
@@ -233,7 +302,7 @@
// 璋冩嫧鏃跺彧鏌ユ満鏋勭被鍨嬬殑闆嗛噰浠撳簱搴撳瓨
// 閮ㄩ棬鍒嗗彂鏃朵笉鍒嗘満鏋勫拰閮ㄩ棬锛屽洜涓鸿皟鎷ㄨ繘鏉ョ殑鐗╁搧涔熺畻鍦ㄥ簱瀛橀噷鍙槸绫诲瀷涓洪儴闂紝鍚屾牱妫�瑙嗘墍鏈変粨搴撹鍨嬪彿鐨勬暟閲�
int num = lWhGoodsService.queryGoodsModelInWareHouseNum(warehouseType, warehouseIdList, baseGoodsModelsId,
- states, buyType);
+ states, buyType);
return ResponseValue.success(num);
}
--
Gitblit v1.9.1