From 9e253a7fd8f57e1f7c3e7288a36167ff878ab28d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 06 十一月 2023 21:59:43 +0800
Subject: [PATCH] 库存管理添加粮权字段
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 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 4c26c08..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
@@ -93,14 +93,14 @@
InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
view.addObject("lprDto", conf);
- //鍒濆鍖栬溅鐗岃瘑鍒�
- inoutManager.initLpr(conf);
+ //鐧昏鍒濆鍖�
+ inoutManager.initInoutRegister(conf);
view.setViewName("admin/inout/in-register");
return view;
}
-
-
+
+
/**
* 鎵︽牱椤甸潰
*
@@ -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());
@@ -287,6 +291,8 @@
if (null != conf) conf.setSort(sort);
view.addObject("cardDto", conf);
+ //绉伴噸椤甸潰鍒濆鍖�
+ inoutManager.initInoutWeight(listInoutConf, sort);
view.setViewName("admin/inout/in-weight");
return view;
@@ -405,7 +411,7 @@
view.addObject("lprDto", conf);
//鍒濆鍖栬溅鐗岃瘑鍒�
- inoutManager.initLpr(conf);
+ inoutManager.initInoutRegister(conf);
view.setViewName("admin/inout/out-register");
return view;
@@ -663,6 +669,8 @@
@RequestMapping("/submit-handle")
@Transactional
public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ log.debug("-------------submitHandle------------------");
return inoutManager.submitHandle(data);
}
@@ -690,16 +698,41 @@
return inoutManager.submitComplete(data);
}
+ /**
+ * 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/inout-check-scan-code")
+ public PageResponse<InoutCheckData> inoutDataByCheckId(@RequestBody InoutCheckParam param) {
+ if (null == param.getCompanyId()) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ return inoutManager.inoutDataByCheckId(param);
+ }
/**
- * 璐ㄦ椤甸潰鎻愪氦
+ * 璐ㄦ椤甸潰浠呮彁浜や繚瀛樺寲楠屼俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-checkItem")
+ @Transactional
+ public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
+ return inoutManager.submitCheckData(data);
+ }
+
+ /**
+ * 璐ㄦ椤甸潰鎻愪氦涓嬩竴娴佺▼
*
* @param data
* @return
*/
@RequestMapping("/submit-check")
@Transactional
- public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data)throws Exception {
+ public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data) throws Exception {
return inoutManager.submitCheck(data);
}
@@ -729,8 +762,6 @@
}
-
-
/**
* 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
*
@@ -741,7 +772,6 @@
public PageResponse<Page<InoutCheckData>> pageSampleData(@RequestBody InoutCheckParam param) {
return inoutManager.pageSampleData(param);
}
-
/**
@@ -765,7 +795,6 @@
public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
return inoutManager.getCheckItemData(param);
}
-
/**
--
Gitblit v1.9.3