From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index f82095f..6c34071 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -197,6 +197,10 @@
Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
view.addObject("listFoodVariety", listFoodVariety);
+ // 绮鎬ц川涓嬫媺妗�
+ List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
+ view.addObject("listFoodType", listFoodType);
+
// 绮绛夌骇涓嬫媺妗�
List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -288,7 +292,7 @@
view.addObject("cardDto", conf);
//绉伴噸椤甸潰鍒濆鍖�
- inoutManager.initInoutWeight(listInoutConf,sort);
+ inoutManager.initInoutWeight(listInoutConf, sort);
view.setViewName("admin/inout/in-weight");
return view;
@@ -696,6 +700,7 @@
/**
* 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+ *
* @param param
* @return
*/
@@ -715,7 +720,7 @@
*/
@RequestMapping("/submit-checkItem")
@Transactional
- public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
+ public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
return inoutManager.submitCheckData(data);
}
--
Gitblit v1.9.3