From 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 08:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 29 ++++
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 59 +++++++++
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue | 2
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 21 +++
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 13 ++
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java | 63 ++++++++++
north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java | 54 +++++++++
north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue | 4
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 3
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 5
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java | 7 +
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 14 ++
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue | 2
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java | 62 ++++++++++
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 3
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 6
16 files changed, 346 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
index a7ed662..45dc608 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
@@ -24,6 +24,8 @@
{field: 'endOperationOrderNumber', width: '100',title: '璋冩嫧搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'processId', width:'140', title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'type', width:'140', title: '棰嗗嚭绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'reviewedTime', width: '140',title: t('productStock.approvedDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -31,6 +33,8 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
+ exportUrl :'/FinishedGoodsInventory/exportFinishedOperateLogReport',
+ exportName:'鎴愬搧鎶ヨ〃',
footList:['quantity']
})
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
index 3e4f9af..7d44a45 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
@@ -35,6 +35,8 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/Delivery/getSelectDeliveryDetailProductReport',
+ exportUrl :'/Delivery/exportDeliveryDetailProductReport',
+ exportName:'鍙戣揣鏄庣粏浜у搧鍒嗙被鎶ヨ〃',
footList:['quantity','area','money']
})
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
index 0212f6b..94be7f0 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
@@ -33,6 +33,8 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/Delivery/getSelectDeliveryDetailReport',
+ exportUrl :'/Delivery/exportDeliveryDetailReport',
+ exportName:'鍙戣揣鏄庣粏鎶ヨ〃',
footList:['quantity','area','money']
})
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index 8230737..99d6cdf 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -5,11 +5,14 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,9 @@
import com.example.erp.entity.mm.FinishedGoodsInventory;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -162,4 +168,11 @@
public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
}
+
+ @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
+ @PostMapping("/exportFinishedOperateLogReport")
+ public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
index b8a688e..0a9d737 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -4,6 +4,9 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
@@ -11,11 +14,15 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.DeliveryService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -101,6 +108,20 @@
return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
}
+ @ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
+ @PostMapping("/exportDeliveryDetailReport")
+ public void exportDeliveryDetailReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, DeliveryDetailDTO.class, deliveryService.exportDeliveryDetailReport(dates),"orderReport");
+ }
+
+ @ApiOperation("鍙戣揣鏄庣粏浜у搧鍒嗙被鎶ヨ〃")
+ @PostMapping("/exportDeliveryDetailProductReport")
+ public void exportDeliveryDetailProductReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
+ }
+
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
new file mode 100644
index 0000000..a07136c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
@@ -0,0 +1,54 @@
+package com.example.erp.dto.mm;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.erp.entity.mm.FinishedOperateLog;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+@Data
+public class FinishedOperateLogDTO{
+ @ExcelProperty("缂栧彿")
+ private Long id;
+ @ExcelProperty("鎿嶄綔鍗曞彿")
+ private String operationOrderNumber;
+ @ExcelProperty("閿�鍞崟鍙�")
+ private String orderId;
+ @ExcelProperty("璁㈠崟搴忓彿")
+ private Integer operationNumber;
+ @ExcelProperty("绫诲瀷")
+ private String operateType;
+ @ExcelProperty("鏁伴噺")
+ private Integer quantity;
+ @ExcelProperty("浜у搧Id")
+ private Integer productId;
+ @ExcelProperty("浜у搧")
+ private String productName;
+ @ExcelProperty("瀹�")
+ private Double width;
+ @ExcelProperty("楂�")
+ private Double height;
+ @ExcelProperty("璋冩嫧閿�鍞崟鍙�")
+ private String staterOperationOrderNumber;
+ @ExcelProperty("璋冩嫧搴忓彿")
+ private String endOperationOrderNumber;
+ @ExcelProperty("鍒跺崟浜�")
+ private String operator;
+ @ExcelProperty("鍒跺崟鏃ユ湡")
+ private LocalDate operateTime;
+ @ExcelProperty("娴佺▼鍗″彿")
+ private String processId;
+ @ExcelProperty("棰嗗嚭绫诲瀷")
+ private String type;
+ @ExcelProperty("瀹℃牳浜�")
+ private String reviewed;
+ @ExcelProperty("瀹℃牳鏃ユ湡")
+ private LocalDate reviewedTime;
+ @ExcelProperty("澶囨敞")
+ private String remarks;
+
+
+
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
new file mode 100644
index 0000000..797b1cb
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
@@ -0,0 +1,62 @@
+package com.example.erp.dto.sd;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.DeliveryDetail;
+import com.example.erp.entity.sd.OrderDetail;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+
+@Data
+public class DeliveryDetailDTO{
+ @ExcelProperty("缂栧彿")
+ private Long id;
+ @ExcelProperty("鍙戣揣鍗曞彿")
+ private String deliveryId;
+ @ExcelProperty("鍙戣揣搴忓彿")
+ private Integer deliveryNumber;
+ @ExcelProperty("浠樻鏉′欢")
+ private String paymentTerms;
+ @ExcelProperty("椤圭洰鍚嶇О")
+ private String project;
+ @ExcelProperty("鏁伴噺")
+ private Integer quantity;
+ @ExcelProperty("闈㈢Н")
+ private Double area;
+ @ExcelProperty("閲戦")
+ private Double money;
+ @ExcelProperty("瀹㈡埛缂栧彿")
+ private String customerId;
+ @ExcelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+ @ExcelProperty("閫佽揣鏃ユ湡")
+ private LocalDate deliveryDate;
+ @ExcelProperty("鏀粯鏂瑰紡")
+ private String payMethod;
+ @ExcelProperty("鏀粯鏃ユ湡")
+ private LocalDate payDate;
+ @ExcelProperty("閿�鍞憳")
+ private String salesman;
+ @ExcelProperty("鍙戣揣鍛�")
+ private String creator;
+ @ExcelProperty("鑱旂郴浜�")
+ private String contacts;
+ @ExcelProperty("鑱旂郴鐢佃瘽")
+ private String contactNumber;
+ @ExcelProperty("閫佽揣鍦板潃")
+ private String deliveryAddress;
+ @ExcelProperty("閿�鍞崟鍙�")
+ private String orderId;
+ @ExcelProperty("璁㈠崟搴忓彿")
+ private Integer orderNumber;
+ @ExcelProperty("澶囨敞")
+ private String deliveryDetailRemakes;
+ @ExcelProperty("鎶ヨ〃鏃ユ湡")
+ private LocalDate createTime;
+
+
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
new file mode 100644
index 0000000..69f537a
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
@@ -0,0 +1,63 @@
+package com.example.erp.dto.sd;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.DeliveryDetail;
+import com.example.erp.entity.sd.OrderDetail;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+@Data
+public class DeliveryDetailProductDTO{
+ @ExcelProperty("缂栧彿")
+ private Long id;
+ @ExcelProperty("鍙戣揣鍗曞彿")
+ private String deliveryId;
+ @ExcelProperty("鍙戣揣搴忓彿")
+ private Integer deliveryNumber;
+ @ExcelProperty("浜у搧Id")
+ private Integer productId;
+ @ExcelProperty("浜у搧")
+ private String productName;
+ @ExcelProperty("浠樻鏉′欢")
+ private String paymentTerms;
+ @ExcelProperty("椤圭洰鍚嶇О")
+ private String project;
+ @ExcelProperty("鏁伴噺")
+ private Integer quantity;
+ @ExcelProperty("闈㈢Н")
+ private Double area;
+ @ExcelProperty("閲戦")
+ private Double money;
+ @ExcelProperty("瀹㈡埛缂栧彿")
+ private String customerId;
+ @ExcelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+ @ExcelProperty("閫佽揣鏃ユ湡")
+ private LocalDate deliveryDate;
+ @ExcelProperty("鏀粯鏂瑰紡")
+ private String payMethod;
+ @ExcelProperty("鏀粯鏃ユ湡")
+ private LocalDate payDate;
+ @ExcelProperty("閿�鍞憳")
+ private String salesman;
+ @ExcelProperty("鍙戣揣鍛�")
+ private String creator;
+ @ExcelProperty("鑱旂郴浜�")
+ private String contacts;
+ @ExcelProperty("鑱旂郴鐢佃瘽")
+ private String contactNumber;
+ @ExcelProperty("閫佽揣鍦板潃")
+ private String deliveryAddress;
+ @ExcelProperty("閿�鍞崟鍙�")
+ private String orderId;
+ @ExcelProperty("璁㈠崟搴忓彿")
+ private Integer orderNumber;
+ @ExcelProperty("澶囨敞")
+ private String deliveryDetailRemakes;
+ @ExcelProperty("鎶ヨ〃鏃ユ湡")
+ private LocalDate createTime;
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
index 5f7eccf..289e597 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -11,6 +11,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -113,6 +114,8 @@
Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
@Param("quantity") Integer quantity);
+
+
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index 1c01e28..d71db9a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -1,5 +1,6 @@
package com.example.erp.mapper.mm;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
@@ -8,6 +9,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -66,11 +68,13 @@
@Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
- List<OrderDetail> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
+ List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+ List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
index d3c26d6..a0f9e83 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java
@@ -1,5 +1,7 @@
package com.example.erp.mapper.sd;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
@@ -8,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -67,4 +70,8 @@
Boolean deleteDeliveryDetail(@Param("deliveryId") String deliveryId);
+ List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates);
+
+ List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates);
+
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 30b5cad..ac2f718 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
@@ -670,6 +671,10 @@
}
+ public List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates) {
+ return finishedOperateLogMapper.exportFinishedOperateLogReport(dates);
+ }
+
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index f774212..61387e1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -6,6 +6,9 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
@@ -338,6 +341,17 @@
}
+ public List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailReport(dates);
+ }
+
+ public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
+ return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
+ }
+
+
+
+
private static final String[] NUMBERS = {"闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�"};
private static final String[] IUNIT = {"鍏�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�"};
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index 7448fbc..a230530 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -837,4 +837,7 @@
;
</select>
+
+
+
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index bfd83e1..1db248a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -648,5 +648,34 @@
)
</insert>
+ <select id="exportFinishedOperateLogReport">
+ select fol.id,
+ fol.operation_order_number,
+ fol.order_id,
+ fol.operate_type,
+ fol.process_id,
+ fol.operation_number,
+ fol.quantity,
+ fol.operator,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ fol.stater_operation_order_number,
+ fol.end_operation_order_number,
+ fol.operate_time,
+ fol.`status`,
+ fol.is_state,
+ fol.reviewed,
+ fol.reviewed_time,
+ fol.type,
+ fol.remarks
+ from (select *
+ from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+ where date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]}
+
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 79f68d8..cb84eab 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -903,4 +903,63 @@
and od.order_id = #{orderId}
and od.product_id = #{productId}
</select>
+
+
+ <select id="exportDeliveryDetailReport">
+ select dd.id,
+ dd.delivery_id,
+ dd.delivery_number,
+ d.payment_terms,
+ d.project,
+ d.customer_id,
+ d.customer_name,
+ d.delivery_date,
+ d.pay_method,
+ d.pay_date,
+ d.salesman,
+ d.creator,
+ d.contacts,
+ d.contact_number,
+ d.delivery_address,
+ dd.order_id,
+ dd.order_number,
+ dd.area,
+ dd.money,
+ dd.quantity,
+ dd.delivery_detail_remakes,
+ dd.create_time
+ from sd.delivery_detail dd
+ left join sd.delivery d on dd.delivery_id=d.delivery_id
+ where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
+ </select>
+
+ <select id="exportDeliveryDetailProductReport">
+ select dd.id,
+ dd.delivery_id,
+ dd.delivery_number,
+ od.product_id,
+ od.product_name,
+ d.payment_terms,
+ d.project,
+ d.customer_id,
+ d.customer_name,
+ d.delivery_date,
+ d.pay_method,
+ d.pay_date,
+ d.salesman,
+ d.creator,
+ d.contacts,
+ d.contact_number,
+ d.delivery_address,
+ dd.order_id,
+ dd.order_number,
+ sum(dd.area) as area,
+ sum(dd.money) as money,
+ sum(dd.quantity) as quantity,
+ dd.delivery_detail_remakes,
+ dd.create_time
+ from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
+ left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
+ where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0