From bdde1c2c0cd6c33435f894c126dc71b4ad5528e4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 16 一月 2026 15:26:17 +0800
Subject: [PATCH] 出库通知单逻辑修改
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 0c1f823..c3ac938 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,11 +6,12 @@
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
+import com.fzzy.work.service.BizWorkService;
import com.fzzy.work.service.WorkOrderConfService;
import com.fzzy.work.service.WorkOrderProcessService;
import com.fzzy.work.service.WorkOrderService;
@@ -37,6 +38,8 @@
private WorkOrderProcessService workOrderProcessService;
@Resource
private WorkOrderConfService workOrderConfService;
+ @Resource
+ private BizWorkService bizWorkService;
/**
*
@@ -73,7 +76,7 @@
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(OrderStatus.STATUS_50.getCode());
+ param.setStatus(WorkStatus.STATUS_50.getCode());
param.setCompanyId(ContextUtil.getCompanyId());
workOrderService.pageQuery(corePage, param);
@@ -93,6 +96,17 @@
@DataProvider
public List<SysDictData> triggerStatus() {
return workOrderService.triggerStatus();
+ }
+
+ /**
+ * 宸ュ崟绫诲瀷
+ * ${dorado.getDataProvider("workOrderPR#triggerBizType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<SysDictData> triggerBizType() {
+ return workOrderService.triggerBizType();
}
@@ -166,4 +180,16 @@
public List<SysDictData> triggerType() {
return workOrderService.triggerType();
}
+
+ //-----------------------娴佺▼澶勭悊---------------------------//
+ /**
+ *
+ * workOrderPR#todo
+ * 淇℃伅鍒楄〃
+ *
+ */
+ @Expose
+ public BaseResp todo(WorkOrderProcess data) {
+ return bizWorkService.todoByProcess(data);
+ }
}
--
Gitblit v1.9.3