From ae2c433ecf08e10d55488320e5db0936ca323710 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 五月 2023 20:44:21 +0800
Subject: [PATCH] 扦样提交3
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
index 8c8298f..386c5de 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
@@ -7,6 +7,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.Page;
import com.ld.igds.data.PageResponse;
+import com.ld.igds.data.SimpleDepot;
import com.ld.igds.file.dto.FileData;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
@@ -28,6 +29,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
+
import javax.annotation.Resource;
import java.net.URLDecoder;
import java.util.Date;
@@ -126,7 +128,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -202,7 +204,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listOutDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -338,7 +340,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
// 绮鍝佺涓嬫媺妗�
@@ -379,7 +381,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptIn(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -410,11 +412,11 @@
.getCompanyId(), deptId);
//鑾峰彇鎵�鏈夌殑鍦扮鍒楄〃鐢ㄤ簬椤甸潰鐢ㄦ埛閫夋嫨
- List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);
+ List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);
view.addObject("listWeight", listWeight);
// 鑾峰彇褰撳墠鍦扮淇℃伅
- WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);
+ InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);
view.addObject("weightDto", weightDto);
// 杩囩▼鎽勫儚澶�1
@@ -456,7 +458,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(), deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
// 绮鍝佺涓嬫媺妗�
@@ -495,7 +497,7 @@
view.addObject("deptId", deptId);
// 浠撳簱鍒楄〃鍋氫笅鎷夋浣跨敤
- List<Depot> listDepot = commonManager.listInDepot();
+ List<SimpleDepot> listDepot = commonManager.getCacheDeptOut(user.getCompanyId(),deptId);
view.addObject(Constant.MODEL_KEY_DEPOT_LIST, listDepot);
//鍏ュ簱娴佺▼
@@ -526,11 +528,11 @@
.getCompanyId(), deptId);
//鑾峰彇鎵�鏈夌殑鍦扮鍒楄〃鐢ㄤ簬椤甸潰鐢ㄦ埛閫夋嫨
- List<WeightDto> listWeight = inoutCommonManager.getInoutWeightAll(listInoutConf, InoutConstant.CONF_TYPE_30);
+ List<InoutConf> listWeight = inoutCommonManager.getInoutConf(listInoutConf, InoutConstant.CONF_TYPE_30);
view.addObject("listWeight", listWeight);
// 鑾峰彇褰撳墠鍦扮淇℃伅
- WeightDto weightDto = inoutCommonManager.getInoutCurWeight(listWeight, sort);
+ InoutConf weightDto = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_30);
view.addObject("weightDto", weightDto);
// 杩囩▼鎽勫儚澶�1
--
Gitblit v1.9.3