From d51849adc8c0ec04bc2384a230e007f5ba562140 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 六月 2024 14:42:56 +0800
Subject: [PATCH] 合并流程卡打印功能，修改报表部分语言显示错误和问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 069e4db..1338259 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.exception.ServiceException;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Date;
import java.util.List;
import java.util.Map;
@@ -55,4 +57,15 @@
public Result updateReplenish( @RequestBody Map<String,Object> object){
return Result.seccess(replenishService.updateReplenish(object));
}
+
+ @ApiOperation("娴佺▼鍗¤ˉ鐗囨墦鍗版煡璇㈡帴鍙�")
+ @PostMapping("/selectReplenishPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ public Result selectReplenishPrintFlowCard(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String project,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(replenishService.selectReplenishPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+ }
}
--
Gitblit v1.8.0