From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
index c3ac938..06dfe90 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
@@ -6,7 +6,6 @@
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrderConf;
@@ -42,44 +41,19 @@
private BizWorkService bizWorkService;
/**
- *
- * workOrderPR#pageQuery
- * 鍒嗛〉鏌ヨ
- * @param page
- * @param param
+ * 鏍规嵁鐢ㄦ埛瑙掕壊閫夋嫨涓嶅悓鐨勫伐鍗曚俊鎭�
+ * @param page 鍒嗛〉淇℃伅
+ * @param param 鍙傛暟
*/
@DataProvider
- public void pageQuery(Page<WorkOrder> page, WorkOrderParam param) {
+ public void pageQueryByUserType(Page<WorkOrder> page, WorkOrderParam param) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
if (null == param) param = new WorkOrderParam();
param.setCompanyId(ContextUtil.getCompanyId());
- workOrderService.pageQuery(corePage, param);
-
- // 閲嶆柊灏佽
- page.setEntities(corePage.getRecords());
- page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
- }
-
- /**
- *
- * workOrderPR#pageQuery2
- * 宸茬粡瀹屾垚锛屽垎椤垫煡璇�
- * @param page
- * @param param
- */
- @DataProvider
- public void pageQuery2(Page<WorkOrder> page, WorkOrderParam param) {
-
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
-
- if (null == param) param = new WorkOrderParam();
- param.setStatus(WorkStatus.STATUS_50.getCode());
- param.setCompanyId(ContextUtil.getCompanyId());
-
- workOrderService.pageQuery(corePage, param);
+ workOrderService.pageQueryByUserType(corePage, param);
// 閲嶆柊灏佽
page.setEntities(corePage.getRecords());
@@ -181,6 +155,17 @@
return workOrderService.triggerType();
}
+ /**
+ * 娴佺▼鑺傜偣
+ * ${dorado.getDataProvider("workOrderPR#triggerNode").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<SysDictData> triggerNode() {
+ return workOrderService.triggerNode();
+ }
+
//-----------------------娴佺▼澶勭悊---------------------------//
/**
*
--
Gitblit v1.9.3