diff --git a/pom.xml b/pom.xml
index 6e199b5..b6dee84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
1.8
3.3.1
8.0.17
- 4.0
+
11.2.0.3
1.1.13
2.3.0
@@ -42,7 +42,7 @@
4.1.1
1.18.4
2.4
- 2.1.1
+ 3.1.2
3.1.0
@@ -119,7 +119,7 @@
com.microsoft.sqlserver
sqljdbc4
- 4.2
+ 4.0
org.springframework.boot
@@ -174,12 +174,6 @@
ojdbc6
${oracle.version}
-
-
- com.microsoft.sqlserver
- sqljdbc4
- ${mssql.version}
-
org.postgresql
diff --git a/src/main/java/com/srq/modules/jst/controller/JstController.java b/src/main/java/com/srq/modules/jst/controller/JstController.java
new file mode 100644
index 0000000..b77ed55
--- /dev/null
+++ b/src/main/java/com/srq/modules/jst/controller/JstController.java
@@ -0,0 +1,239 @@
+package com.srq.modules.jst.controller;
+
+
+import com.srq.common.utils.R;
+import com.srq.modules.jst.data.*;
+import com.srq.modules.jst.service.JstService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/jst")
+public class JstController {
+
+ @Autowired
+ private JstService jstService;
+ private static final Logger logger = LoggerFactory.getLogger(JstController.class);
+
+
+ @RequestMapping(value = "/getSaleOrderFileHist")
+ public R getSaleOrderFileHist(@RequestBody SalesOrderFileData inData){
+ List resultList = jstService.getSaleOrderFileHist(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!")
+ .put("rows", resultList)
+ .put("total", resultList.size());
+ }
+
+ /**
+ * @description: 文件上传
+ * @author LR
+ * @date 2023/7/25 15:02
+ * @version 1.0
+ */
+ @PostMapping("/uploadSalesOrderFile")
+ public R uploadSalesOrderFile(@RequestParam("file") MultipartFile file, @ModelAttribute GetParamInData inData) throws Exception {
+ jstService.uploadSalesOrderFile(file, inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: excel批量导入数据表中
+ * @author LR
+ * @date 2023/7/31 11:37
+ * @version 1.0
+ */
+ @PostMapping("/batchInsertSalesOrderItems")
+ public R batchInsertSalesOrderItems(@RequestBody SalesOrderFileData inData) throws Exception {
+ jstService.batchInsertSalesOrderItems(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 检查销售单信息
+ * @author LR
+ * @date 2023/7/27 15:58
+ * @version 1.0
+ */
+ @RequestMapping(value = "/checkSalesOrderException")
+ public R checkSalesOrderException(){
+ jstService.checkSalesOrderException();
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+
+ /**
+ * @description: 获取异常的信息
+ * @author LR
+ * @date 2023/7/24 17:11
+ * @version 1.0
+ */
+ @RequestMapping(value = "/getExceptionList")
+ public R getExceptionList(@RequestBody JstExceptionData inData){
+ List resultList = jstService.getExceptionList(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!")
+ .put("rows", resultList)
+ .put("total", resultList.size());
+ }
+
+ /**
+ * @description: 文件下载
+ * @author LR
+ * @date 2023/7/31 18:58
+ * @version 1.0
+ */
+ @RequestMapping(value = "/downSalesOrder")
+ public void downSalesOrder(@ModelAttribute GetParamInData inData, HttpServletResponse response) throws Exception {
+ jstService.downSalesOrder(inData, response);
+ }
+
+ /**
+ * @description: 获取当前的店铺的相关信息
+ * @author LR
+ * @date 2023/8/2 18:08
+ * @version 1.0
+ */
+ @RequestMapping(value = "/getShopStores")
+ public R getShopStores(@RequestBody ShopStoreData inData){
+ List resultList = jstService.getShopStores(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!")
+ .put("rows", resultList)
+ .put("total", resultList.size());
+ }
+
+ /**
+ * @description: 插入当前的店铺数据
+ * @author LR
+ * @date 2023/8/3 17:48
+ * @version 1.0
+ */
+ @RequestMapping(value = "/insertShopStore")
+ public R insertShopStore(@RequestBody ShopStoreData inData){
+ jstService.insertShopStore(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 修改店铺的相关信息
+ * @author LR
+ * @date 2023/8/3 18:06
+ * @version 1.0
+ */
+ @RequestMapping(value = "/saveShopStore")
+ public R saveShopStore(@RequestBody ShopStoreData inData){
+ jstService.saveShopStore(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 销售单的品牌信息
+ * @author LR
+ * @date 2023/8/4 9:48
+ * @version 1.0
+ */
+ @RequestMapping(value = "/getSalesOrderBrand")
+ public R getSalesOrderBrand(@RequestBody SalesOrderBrandData inData){
+ List resultList = jstService.getSalesOrderBrand(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!")
+ .put("rows", resultList)
+ .put("total", resultList.size());
+ }
+
+ /**
+ * @description: 插入当前的品牌数据
+ * @author LR
+ * @date 2023/8/3 17:48
+ * @version 1.0
+ */
+ @RequestMapping(value = "/insertSalesOrderBrand")
+ public R insertSalesOrderBrand(@RequestBody SalesOrderBrandData inData){
+ jstService.insertSalesOrderBrand(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 修改品牌的相关信息
+ * @author LR
+ * @date 2023/8/3 18:06
+ * @version 1.0
+ */
+ @RequestMapping(value = "/saveSalesOrderBrand")
+ public R saveSalesOrderBrand(@RequestBody SalesOrderBrandData inData){
+ jstService.saveSalesOrderBrand(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 获取销售明细的仓库
+ * @author LR
+ * @date 2023/8/4 11:26
+ * @version 1.0
+ */
+ @RequestMapping(value = "/getSalesOrderWarehouse")
+ public R getSalesOrderWarehouse(@RequestBody SalesOrderWarehouseData inData){
+ List resultList = jstService.getSalesOrderWarehouse(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!")
+ .put("rows", resultList)
+ .put("total", resultList.size());
+ }
+
+ /**
+ * @description: 新增销售单的仓库信息
+ * @author LR
+ * @date 2023/8/4 13:20
+ * @version 1.0
+ */
+ @RequestMapping(value = "/insertSalesOrderWarehouse")
+ public R insertSalesOrderWarehouse(@RequestBody SalesOrderWarehouseData inData){
+ jstService.insertSalesOrderWarehouse(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+ /**
+ * @description: 保存销售单的仓库信息
+ * @author LR
+ * @date 2023/8/4 13:30
+ * @version 1.0
+ */
+ @RequestMapping(value = "/saveSalesOrderWarehouse")
+ public R saveSalesOrderWarehouse(@RequestBody SalesOrderWarehouseData inData){
+ jstService.saveSalesOrderWarehouse(inData);
+ return R.ok()
+ .put("code", 200)
+ .put("msg", "操作成功!");
+ }
+
+}
diff --git a/src/main/java/com/srq/modules/jst/dao/JstDao.java b/src/main/java/com/srq/modules/jst/dao/JstDao.java
new file mode 100644
index 0000000..4194138
--- /dev/null
+++ b/src/main/java/com/srq/modules/jst/dao/JstDao.java
@@ -0,0 +1,191 @@
+package com.srq.modules.jst.dao;
+
+import com.srq.modules.jst.data.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 接口dao
+ * @author LR
+ * @date 2023/7/24 16:23
+ * @version 1.0
+ */
+public interface JstDao {
+
+ /**
+ * @description: 查询当前的上传记录表
+ * @author LR
+ * @date 2023/7/31 10:34
+ * @version 1.0
+ */
+ List getSaleOrderFileHist(String fileName, String status);
+
+ /**
+ * @description: 保存文件上传的记录数据
+ * @author LR
+ * @date 2023/7/31 10:28
+ * @version 1.0
+ */
+ void insertUploadFileHist(SalesOrderFileData salesOrderFile);
+
+ /**
+ * @description: 获取销售单需要导入的key
+ * @author LR
+ * @date 2023/7/25 15:23
+ * @version 1.0
+ */
+ List getSalesOrderColumns();
+
+ /**
+ * @description: 清空当前销售明细记录表
+ * @author LR
+ * @date 2023/7/31 11:59
+ * @version 1.0
+ */
+ void clearSalesOrder();
+
+ /**
+ * @description: 批量保存当前的参数
+ * @author LR
+ * @date 2023/7/27 10:00
+ * @version 1.0
+ */
+ void batchInsertSalesOrder(List