From 8bba7f03df59c7689dbb64a952a63944a1f43ade Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 16:05:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java
index 6531a9f..daf61e8 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java
@@ -3,6 +3,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
import com.ld.igds.inout.InoutConstant;
+import com.ld.igds.inout.dto.InoutCheckData;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.manager.InoutReportManager;
import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.Date;
/**
@@ -21,7 +23,7 @@
@RequestMapping("basic/inout/report")
public class InoutReportController {
- @Autowired
+ @Resource
private InoutReportManager reportManager;
@@ -49,4 +51,28 @@
"鍚庡彴寮傚父锛�" + e.getMessage());
}
}
+
+
+ /**
+ * 鎵撳嵃鎵︽牱鍗�
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/bill-simple")
+ public PageResponse<String> simpleBill(@RequestBody InoutCheckData data) {
+ try {
+ String html = reportManager.simpleBill(data);
+ if (null == html) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鐢熸垚鎵撳嵃鐮佸け璐�");
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, html);
+ } catch (Exception e) {
+ log.error("鍚庡彴寮傚父:{}", e);
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴寮傚父锛�" + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3