From 026633fc906934909fa78f8e1cdfa7861b483c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 20 Dec 2024 16:24:03 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BB=8F=E7=90=86=E5=92=8C=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/IMakeReturnOrderService.java | 9 ++++++++- .../templates/system/makeReturnOrder/taskScjlVerify.html | 2 +- .../templates/system/makeReturnOrder/taskSczgVerify.html | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IMakeReturnOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IMakeReturnOrderService.java index 0b40710f..bd19d81c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IMakeReturnOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IMakeReturnOrderService.java @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.system.domain.MakeReturnOrder; import com.ruoyi.system.domain.SysMakeorderPick; import com.ruoyi.system.domain.Vo.MakeReturnOrderVO; +import com.ruoyi.system.domain.exportDto.MakeReturnOrderDto; import org.activiti.engine.runtime.ProcessInstance; /** @@ -25,7 +26,7 @@ public interface IMakeReturnOrderService /** * 查询生产退料单列表 * - * @param makeReturnOrder 生产退料单 + * @param makeReturnOrderVO 生产退料单 * @return 生产退料单集合 */ public List selectMakeReturnOrderList(MakeReturnOrderVO makeReturnOrderVO); @@ -56,4 +57,10 @@ public interface IMakeReturnOrderService /*更新审批拒绝*/ public int updateUnApproved(MakeReturnOrderVO makeReturnOrderVO); + + /** + * 获取生产退料单导出列表 + */ + public List getMakeReturnExportList(MakeReturnOrderVO makeReturnOrderVO,String ids); + } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskScjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskScjlVerify.html index ca674c81..5903e642 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskScjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskScjlVerify.html @@ -208,7 +208,7 @@ { field: 'hasReturnNum', align: 'center', - title: '已退料数', + title: '实际已退料数', formatter: function (value,row,index){ if (value == null || value == ''){ return 0; diff --git a/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskSczgVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskSczgVerify.html index a6fcea33..a7429564 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskSczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeReturnOrder/taskSczgVerify.html @@ -208,7 +208,7 @@ { field: 'hasReturnNum', align: 'center', - title: '已退料数', + title: '实际已退料数', formatter: function (value,row,index){ if (value == null || value == ''){ return 0;