From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java | 115 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 49 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
index 71c45c9..6cc104d 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
@@ -15,69 +15,86 @@
import java.util.Map;
/**
- * 缁煎悎涓氬姟-绮鍝佺鍙樻洿璁板綍
- *
+ * 缁煎悎涓氬姟-鍊掍粨璁板綍
+ *
* @author: andy.jia
* @description:
* @version:
* @data:2020骞�5鏈�28鏃�
- *
*/
@Component
public class StockChangePR {
- @Autowired
- private HMAtockChangeService service;
+ @Autowired
+ private HMAtockChangeService service;
- /**
- * 鍊掍粨绫诲瀷
- * ${dorado.getDataProvider("stockChangePR#triggerType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 鍊掍粨绫诲瀷
+ * ${dorado.getDataProvider("stockChangePR#triggerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger("0", "鍊掍粨"));
- list.add(new DicTrigger("1", "绉诲簱"));
+ list.add(new DicTrigger("0", "鍊掍粨"));
+ list.add(new DicTrigger("1", "绉诲簱"));
- return list;
- }
+ return list;
+ }
- /**
- * stockChangePR#pageData
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
- throws Exception {
- service.pageData(page, param);
- }
+ /**
+ * 鍖呰鐗�
+ * ${dorado.getDataProvider("stockChangePR#triggerBzw").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerBzw() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- /**
- * stockChangePR#saveData
- *
- * @param data
- */
- @DataResolver
- public void saveData(InoutStockChange data) {
- service.saveData(data);
- }
+ list.add(new DicTrigger("1", "楹昏"));
+ list.add(new DicTrigger("2", "缂栫粐琚�"));
+ list.add(new DicTrigger("3", "鏁ｈ"));
+ list.add(new DicTrigger("9", "鍏朵粬"));
- /**
- * stockChangePR#delData
- *
- * @param data
- * @return
- */
- @Expose
- public String delData(InoutStockChange data) {
- return service.delData(data);
- }
+ return list;
+ }
+
+ /**
+ * stockChangePR#pageData
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
+ throws Exception {
+ service.pageData(page, param);
+ }
+
+ /**
+ * stockChangePR#saveData
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveData(InoutStockChange data) {
+ service.saveData(data);
+ }
+
+ /**
+ * stockChangePR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(InoutStockChange data) {
+ return service.delData(data);
+ }
}
--
Gitblit v1.9.3