canrd-outside / order-erp · Commits

Commit edf167a31fb9b294daa09b83193ced389bf92bc2

Authored by chwork
2 parents a441cb72 9d11e9bc
build: skipped

Merge branch 'fix-main-ch' into 'main' 

fix:剔除多余代码.



See merge request !3
Inline Side-by-side
Showing 30 changed files with 24 additions and 1475 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.common.utils;  
2 -  
3 -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;  
4 -import com.order.erp.common.constant.Constant;  
5 -import com.order.erp.domain.dto.order.OrderBaseInfoDO;  
6 -import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;  
7 -import com.order.erp.domain.pdf.OrderProducePdfVO;  
8 -import com.order.erp.service.order.OrderBaseInfoService;  
9 -import com.order.erp.service.order.OrderProfitAnalysisService;  
10 -import lombok.extern.slf4j.Slf4j;  
11 -import org.springframework.beans.BeanUtils;  
12 -import org.springframework.beans.factory.annotation.Value;  
13 -import org.springframework.stereotype.Service;  
14 -import wiki.xsx.core.pdf.component.image.XEasyPdfImage;  
15 -import wiki.xsx.core.pdf.component.table.XEasyPdfCell;  
16 -import wiki.xsx.core.pdf.component.table.XEasyPdfRow;  
17 -import wiki.xsx.core.pdf.component.table.XEasyPdfTable;  
18 -import wiki.xsx.core.pdf.doc.*;  
19 -import wiki.xsx.core.pdf.handler.XEasyPdfHandler;  
20 -  
21 -import javax.annotation.Resource;  
22 -import java.io.File;  
23 -import java.io.InputStream;  
24 -import java.io.OutputStream;  
25 -import java.math.BigDecimal;  
26 -import java.net.URL;  
27 -import java.util.*;  
28 -import java.util.function.Function;  
29 -import java.util.stream.Collectors;  
30 -  
31 -/**  
32 - * @author: xms  
33 - * @description: TODO  
34 - * @date: 2024/7/17 16:30  
35 - * @version: 1.0  
36 - */  
37 -@Slf4j  
38 -@Service  
39 -public class EasyPdfUtils {  
40 -  
41 - @Resource  
42 - private OrderBaseInfoService orderBaseInfoService;  
43 -  
44 - @Resource  
45 - private OrderProfitAnalysisService profitAnalysisService;  
46 -  
47 - @Value("${file.path}")  
48 - private String path;  
49 -  
50 - public List<OrderProducePdfVO> build() {  
51 - List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>().gt(OrderBaseInfoDO::getId, 1).last("limit 10"));  
52 - Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());  
53 - List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().in(OrderProfitAnalysisDO::getOrderId, orderIds));  
54 - Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity()));  
55 - return orderBaseInfoDOList.stream().map(x -> {  
56 - OrderProducePdfVO producePdfVO = new OrderProducePdfVO();  
57 - BeanUtils.copyProperties(x, producePdfVO);  
58 - OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(x.getId());  
59 - if (Objects.nonNull(profitAnalysisDO)) {  
60 - producePdfVO.setProductionDepartmentPrice(producePdfVO.getProductionDepartmentPrice());  
61 - producePdfVO.setProductionDepartmentTotalPrice(producePdfVO.getProductionDepartmentTotalPrice());  
62 - }  
63 - return producePdfVO;  
64 - }).collect(Collectors.toList());  
65 - }  
66 -  
67 - /**  
68 - * @param pdfVOList  
69 - * @param fileName  
70 - * @return  
71 - */  
72 - public File createProducePdf(List<OrderProducePdfVO> pdfVOList, String fileName) {  
73 - String pathUri = path + "pdfs" + File.separator + AliOssUtil.getUniqueFileName(fileName);  
74 - OutputStream os = FileUtil.getOutputStream(pathUri);  
75 - XEasyPdfDocument document = createProducePdf(pdfVOList);  
76 - document.save(os);  
77 - return FileUtil.file(pathUri);  
78 - }  
79 -  
80 - /**  
81 - * @param pdfVOList  
82 - * @return  
83 - */  
84 - public XEasyPdfDocument createProducePdf(List<OrderProducePdfVO> pdfVOList) {  
85 - // 构建文档  
86 - XEasyPdfDocument document = XEasyPdfHandler.Document.build();  
87 -  
88 - try {  
89 - // 表格  
90 - XEasyPdfTable table = createTable(pdfVOList);  
91 - // 创建页面  
92 - XEasyPdfPage page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 100F), table);  
93 - // 将页面添加到文档  
94 - document.addPage(page);  
95 - // 添加页脚  
96 - document.setGlobalFooter(XEasyPdfHandler.Footer.build(  
97 - //构建文本（使用当前页占位符)  
98 - XEasyPdfHandler.Text.build(  
99 - XEasyPdfHandler.Page.getCurrentPagePlaceholder() +  
100 - "/" +  
101 - XEasyPdfHandler.Page.getTotalPagePlaceholder()).  
102 - setFontSize(10F).setHorizontalStyle(XEasyPdfPositionStyle.CENTER).  
103 - setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT)  
104 - ));  
105 - // 开启总页码占位符替换  
106 - document.enableReplaceTotalPagePlaceholder();  
107 - return document;  
108 - } catch (Exception e) {  
109 - return null;  
110 - }  
111 - }  
112 -  
113 - /**  
114 - * @param imageFile  
115 - * @param width  
116 - * @return  
117 - */  
118 - private XEasyPdfCell createImageCell(File imageFile, float width) {  
119 - XEasyPdfImage image = XEasyPdfHandler.Image.build(imageFile).  
120 - setHeight(40F).setWidth(80F).  
121 - setMarginTop(0F).setMarginLeft(0F).  
122 - setVerticalStyle(XEasyPdfPositionStyle.CENTER).setHorizontalStyle(XEasyPdfPositionStyle.CENTER);  
123 -  
124 - XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, 60F).  
125 - addContent(image).  
126 - setVerticalStyle(XEasyPdfPositionStyle.CENTER).  
127 - setHorizontalStyle(XEasyPdfPositionStyle.CENTER).  
128 - enableCenterStyle().enableComponentSelfStyle();  
129 - return cell;  
130 - }  
131 -  
132 - /**  
133 - * @param text  
134 - * @param width  
135 - * @return  
136 - */  
137 - private XEasyPdfCell createCell(String text, float width, float fontSize) {  
138 - XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, 50F).  
139 - addContent(XEasyPdfHandler.Text.build(text).  
140 - setVerticalStyle(XEasyPdfPositionStyle.CENTER).  
141 - setHorizontalStyle(XEasyPdfPositionStyle.CENTER).  
142 - setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT).setFontSize(fontSize)).  
143 - enableCenterStyle().enableComponentSelfStyle();  
144 - return cell;  
145 - }  
146 -  
147 - /**  
148 - * @param text  
149 - * @param width  
150 - * @return  
151 - */  
152 - private XEasyPdfCell createCell(String text, float width, float height, float fontSize, XEasyPdfDefaultFontStyle fontStyle) {  
153 - XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, height).  
154 - addContent(XEasyPdfHandler.Text.build(text).  
155 - setVerticalStyle(XEasyPdfPositionStyle.CENTER).  
156 - setHorizontalStyle(XEasyPdfPositionStyle.CENTER).  
157 - setDefaultFontStyle(fontStyle).setFontSize(fontSize)).  
158 - enableCenterStyle().enableComponentSelfStyle();  
159 - return cell;  
160 - }  
161 -  
162 - /**  
163 - * @param text  
164 - * @param width  
165 - * @return  
166 - */  
167 - private XEasyPdfCell createCell(String text, float width) {  
168 - XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width).  
169 - addContent(XEasyPdfHandler.Text.build(text).  
170 - setVerticalStyle(XEasyPdfPositionStyle.CENTER).  
171 - setHorizontalStyle(XEasyPdfPositionStyle.CENTER).  
172 - setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT).setFontSize(16)).  
173 - enableCenterStyle().enableComponentSelfStyle();  
174 - return cell;  
175 - }  
176 -  
177 - /**  
178 - * @param text  
179 - * @param width  
180 - * @return  
181 - */  
182 - private XEasyPdfCell createCell(String text, float width, float height, float fontSize,  
183 - XEasyPdfDefaultFontStyle fontStyle,  
184 - XEasyPdfPositionStyle verticalStyle,  
185 - XEasyPdfPositionStyle horizontalStyle) {  
186 - XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, height).  
187 - addContent(XEasyPdfHandler.Text.build(text).  
188 - setVerticalStyle(verticalStyle).  
189 - setHorizontalStyle(horizontalStyle).  
190 - setDefaultFontStyle(fontStyle).setFontSize(fontSize)).  
191 - enableCenterStyle().enableComponentSelfStyle();  
192 - return cell;  
193 - }  
194 -  
195 - /**  
196 - * @return  
197 - */  
198 - private XEasyPdfTable createTable(List<OrderProducePdfVO> pdfVOList) throws Exception {  
199 - XEasyPdfTable table = XEasyPdfHandler.Table.build();  
200 - List<XEasyPdfRow> rowList = new ArrayList<>();  
201 - List<XEasyPdfCell> cellList = new ArrayList<>(15);  
202 - List<XEasyPdfCell> header = new ArrayList<>(1);  
203 - header.add(createCell("青岛吉庆天成生产订单", 1660F, 70F, 24F, XEasyPdfDefaultFontStyle.BOLD));  
204 - rowList.add(XEasyPdfHandler.Table.Row.build(header));  
205 -  
206 - // 第一行设置表头，默认标题  
207 - cellList.add(createCell("编号", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
208 - cellList.add(createCell("项目号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
209 - cellList.add(createCell("生产科", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
210 - cellList.add(createCell("内部编号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
211 - cellList.add(createCell("客户订单号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
212 - cellList.add(createCell("客户款号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
213 - cellList.add(createCell("订单颜色", 140F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
214 - cellList.add(createCell("颜色中文", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
215 - cellList.add(createCell("订单图片", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
216 - cellList.add(createCell("产品意见", 150F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
217 - cellList.add(createCell("订单数量", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
218 - cellList.add(createCell("生产科交期", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
219 - cellList.add(createCell("包装类型", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
220 - cellList.add(createCell("生产科单价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
221 - cellList.add(createCell("生产科总价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));  
222 - rowList.add(XEasyPdfHandler.Table.Row.build(cellList));  
223 - Integer orderTotalCount = 0;  
224 - BigDecimal totalPrice = new BigDecimal(Constant.ZERO);  
225 - for (int i = 0; i < pdfVOList.size(); i++) {  
226 - OrderProducePdfVO producePdfVO = pdfVOList.get(i);  
227 - URL url = new URL(producePdfVO.getPicUrl());  
228 - InputStream inputStream = url.openStream();  
229 - File imageFile = FileUtil.inputStreamToFile(inputStream, "order.png");  
230 - orderTotalCount += Objects.nonNull(producePdfVO.getOrderCount()) ? producePdfVO.getOrderCount() : Constant.ZERO;  
231 - String productionDepartmentConsignTime = StringUtils.isNotEmpty(producePdfVO.getProductionDepartmentConsignTime()) ?  
232 - DateUtils.format(DateUtils.parseDate(producePdfVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE) : "";  
233 - totalPrice = totalPrice.add(new BigDecimal(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? producePdfVO.getProductionDepartmentTotalPrice() : Constant.ZERO));  
234 - List<XEasyPdfCell> dataCellList = new ArrayList<>(15);  
235 - dataCellList.add(createCell("" + (i + 1), 90F));  
236 - dataCellList.add(createCell(producePdfVO.getProjectNo(), 110F));  
237 - dataCellList.add(createCell(producePdfVO.getProductionDepartment(), 110F));  
238 - dataCellList.add(createCell(producePdfVO.getInnerNo(), 110F));  
239 - dataCellList.add(createCell(producePdfVO.getCustomerPo(), 110F));  
240 - dataCellList.add(createCell(producePdfVO.getCustomerStyle(), 110F));  
241 - dataCellList.add(createCell(producePdfVO.getPoColor(), 140F));  
242 - dataCellList.add(createCell(producePdfVO.getCnColor(), 110F));  
243 - dataCellList.add(createImageCell(imageFile, 110F));  
244 - dataCellList.add(createCell(producePdfVO.getProductionComment(), 150F));  
245 - dataCellList.add(createCell("" + producePdfVO.getOrderCount(), 90F));  
246 - dataCellList.add(createCell(productionDepartmentConsignTime, 110F));  
247 - dataCellList.add(createCell(producePdfVO.getPacketType(), 90F));  
248 - dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + producePdfVO.getProductionDepartmentPrice() : "", 110F));  
249 - dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + producePdfVO.getProductionDepartmentTotalPrice() : "", 110F));  
250 - rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList));  
251 - }  
252 - List<XEasyPdfCell> endCellList = new ArrayList<>(15);  
253 - endCellList.add(createCell("合计", 90F, 16F));  
254 - endCellList.add(createCell("", 110F));  
255 - endCellList.add(createCell("", 110F));  
256 - endCellList.add(createCell("", 110F));  
257 - endCellList.add(createCell("", 110F));  
258 - endCellList.add(createCell("", 110F));  
259 - endCellList.add(createCell("", 140F));  
260 - endCellList.add(createCell("", 110F));  
261 - endCellList.add(createCell("", 110F));  
262 - endCellList.add(createCell("", 150F));  
263 - endCellList.add(createCell("" + orderTotalCount, 90F, 16F));  
264 - endCellList.add(createCell("", 110F));  
265 - endCellList.add(createCell("", 90F));  
266 - endCellList.add(createCell("", 110F));  
267 - endCellList.add(createCell("" + totalPrice, 110F, 16F));  
268 - rowList.add(XEasyPdfHandler.Table.Row.build(endCellList));  
269 - List<XEasyPdfCell> signList = new ArrayList<>(2);  
270 - signList.add(createCell("吉庆天成签字+日期：", 640F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));  
271 - signList.add(createCell("外加工签字+日期：", 1020F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));  
272 - rowList.add(XEasyPdfHandler.Table.Row.build(signList));  
273 -  
274 - table.addRow(rowList);  
275 - table.setHorizontalStyle(XEasyPdfPositionStyle.CENTER).setMarginLeft(10F).setMarginTop(60F).setMarginBottom(10F);  
276 - return table;  
277 - }  
278 -  
279 -}  
src/main/java/com/order/erp/controller/OrderOpinionLonController.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.controller;  
2 -  
3 -import com.order.erp.common.annotation.AnonymousAccess;  
4 -import com.order.erp.common.constant.ServerResult;  
5 -import com.order.erp.domain.dto.order.OrderOpinionLogDO;  
6 -import com.order.erp.domain.vo.order.OrderOpinionLogVO;  
7 -import com.order.erp.service.order.OrderOpinionLogService;  
8 -import io.swagger.annotations.Api;  
9 -import io.swagger.annotations.ApiOperation;  
10 -import org.springframework.validation.annotation.Validated;  
11 -import org.springframework.web.bind.annotation.PostMapping;  
12 -import org.springframework.web.bind.annotation.RequestBody;  
13 -import org.springframework.web.bind.annotation.RequestMapping;  
14 -import org.springframework.web.bind.annotation.RestController;  
15 -  
16 -import javax.annotation.Resource;  
17 -  
18 -/**  
19 - *  
20 - * 订单跟单结果记录日志表(OrderOpinionLogDO)表控制层  
21 - * @Author:ch  
22 - * @createTime:2024-08-05  
23 - */  
24 -@Api(tags = "订单跟单结果记录")  
25 -@RestController  
26 -@RequestMapping("/order/erp/opinion/log")  
27 -public class OrderOpinionLonController {  
28 -  
29 - @Resource  
30 - private OrderOpinionLogService orderOpinionLogService;  
31 -  
32 - @PostMapping("/query_by_id")  
33 - @ApiOperation("查询订单的跟单结果记录")  
34 - @AnonymousAccess  
35 - public ServerResult queryById(@RequestBody @Validated OrderOpinionLogVO orderOpinionLogVo){  
36 - return orderOpinionLogService.queryById(orderOpinionLogVo);  
37 - }  
38 -  
39 -}  
src/main/java/com/order/erp/domain/OrderOpinionLogEnum.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain;  
2 -  
3 -import lombok.AllArgsConstructor;  
4 -import lombok.Getter;  
5 -  
6 -/**  
7 - * @Author:ch  
8 - * @createTime:2024-08-05  
9 - */  
10 -  
11 -@Getter  
12 -@AllArgsConstructor  
13 -public enum OrderOpinionLogEnum {  
14 - ORDER_PRODUCTION_COMMENT("productionComment","产品意见"),  
15 - ORDER_PP_CONFIRRM_RESULT("ppConfirmResult","pp样品确认意见"),  
16 - ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT("shippmentSampleConfirmResult","shipment sample确认意见"),  
17 - ORDER_AITEX_TEST_FINISH_RESULT("aitexTestResult","Altex测试结果"),  
18 - ORDER_SGS_TEST_FINISH_RESULT("sgsTestFinishResult","SGS测试结果"),  
19 - ;  
20 - private String type;  
21 -  
22 - private String desc;  
23 -}  
src/main/java/com/order/erp/domain/dto/order/OrderOpinionLogDO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.dto.order;  
2 -  
3 -import com.baomidou.mybatisplus.annotation.TableName;  
4 -import com.order.erp.domain.dto.BaseDO;  
5 -import lombok.*;  
6 -import lombok.experimental.SuperBuilder;  
7 -  
8 -import javax.validation.constraints.NotNull;  
9 -import java.io.Serializable;  
10 -  
11 -/**  
12 - * @Author:ch  
13 - * @createTime:2024-08-05  
14 - * @Description:订单跟单结果记录日志表。  
15 - */  
16 -  
17 -@TableName("order_opinion_log")  
18 -@Data  
19 -@AllArgsConstructor  
20 -@ToString  
21 -@NoArgsConstructor  
22 -@EqualsAndHashCode(callSuper = false)  
23 -@SuperBuilder  
24 -public class OrderOpinionLogDO extends BaseDO implements Serializable {  
25 - private Long id;  
26 -  
27 - /**  
28 - * 订单id  
29 - */  
30 - private Long orderId;  
31 - /**  
32 - * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)  
33 - */  
34 - private String opinionType;  
35 -  
36 - /**  
37 - * 更新字段  
38 - */  
39 - private String field;  
40 -}  
src/main/java/com/order/erp/domain/email/OrderProductEmailVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.email;  
2 -  
3 -import com.order.erp.domain.dto.order.OrderBaseInfoDO;  
4 -import com.order.erp.domain.dto.order.OrderInspectionStageDO;  
5 -import lombok.*;  
6 -import lombok.experimental.SuperBuilder;  
7 -  
8 -/**  
9 - * @Author:ch  
10 - * @createTime:2024-07-24  
11 - */  
12 -@Data  
13 -@AllArgsConstructor  
14 -@ToString  
15 -@NoArgsConstructor  
16 -@EqualsAndHashCode(callSuper = false)  
17 -@SuperBuilder  
18 -public class OrderProductEmailVO {  
19 -  
20 - private OrderBaseInfoDO baseInfo;  
21 -  
22 - private OrderInspectionStageDO inspectionStageInfo;  
23 -}  
src/main/java/com/order/erp/domain/pdf/OrderProducePdfVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.pdf;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 生产指示书pdf  
10 - *  
11 - * @author makejava  
12 - * @since 2023-09-08 15:26:43  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@NoArgsConstructor  
18 -@EqualsAndHashCode(callSuper = false)  
19 -@SuperBuilder  
20 -public class OrderProducePdfVO implements Serializable {  
21 -  
22 - /**  
23 - * 项目号  
24 - */  
25 - private String projectNo;  
26 -  
27 - /**  
28 - * 生产科  
29 - */  
30 - private String productionDepartment;  
31 -  
32 - /**  
33 - * 内部编号  
34 - */  
35 - private String innerNo;  
36 -  
37 - /**  
38 - * 客户po号(客户订单号)  
39 - */  
40 - private String customerPo;  
41 -  
42 - /**  
43 - * 客户STYLE#(客户款号)  
44 - */  
45 - private String customerStyle;  
46 -  
47 - /**  
48 - * PO COLOR (订单颜色)  
49 - */  
50 - private String poColor;  
51 -  
52 - /**  
53 - * 颜色中文  
54 - */  
55 - private String cnColor;  
56 -  
57 - /**  
58 - * pic图片地址(订单图片)  
59 - */  
60 - private String picUrl;  
61 -  
62 - /**  
63 - * 产品意见  
64 - */  
65 - private String productionComment;  
66 -  
67 - /**  
68 - * 订单数量  
69 - */  
70 - private Integer orderCount;  
71 -  
72 - /**  
73 - * 生成科拖货时间(生产科交期)  
74 - */  
75 - private String productionDepartmentConsignTime;  
76 -  
77 - /**  
78 - * 包装类型  
79 - */  
80 - private String packetType;  
81 -  
82 - /**  
83 - * 生成科单价￥  
84 - */  
85 - private Double productionDepartmentPrice;  
86 -  
87 - /**  
88 - * 生成科总价￥  
89 - */  
90 - private Double productionDepartmentTotalPrice;  
91 -  
92 -}  
src/main/java/com/order/erp/domain/vo/order/CheckBillMappingQueryVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.vo.BasePageVO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import java.io.Serializable;  
8 -import java.util.List;  
9 -  
10 -/**  
11 - * 生产科对账单应收账单映射表(CheckBillMapping)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:37  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class CheckBillMappingQueryVO extends BasePageVO implements Serializable {  
23 -  
24 - private List<Long> ids;  
25 -  
26 -  
27 - private Long id;  
28 - /**  
29 - * 生产科对账单号  
30 - */  
31 - private String checkNo;  
32 - /**  
33 - * check账单id  
34 - */  
35 - private Long checkBillId;  
36 - /**  
37 - * 订单id  
38 - */  
39 - private Long orderId;  
40 -  
41 -  
42 -}  
43 -  
src/main/java/com/order/erp/domain/vo/order/CheckBillMappingVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 生产科对账单应收账单映射表(CheckBillMapping)实体类  
10 - *  
11 - * @author makejava  
12 - * @since 2024-08-05 16:26:37  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@NoArgsConstructor  
18 -@EqualsAndHashCode(callSuper = false)  
19 -@SuperBuilder  
20 -public class CheckBillMappingVO implements Serializable {  
21 -  
22 - private Long id;  
23 - /**  
24 - * 生产科对账单号  
25 - */  
26 - private String checkNo;  
27 - /**  
28 - * check账单id  
29 - */  
30 - private Long checkBillId;  
31 - /**  
32 - * 订单id  
33 - */  
34 - private Long orderId;  
35 -  
36 -  
37 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBaseOrderQueryVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.vo.BasePageVO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import javax.validation.constraints.NotBlank;  
8 -import java.io.Serializable;  
9 -  
10 -/**  
11 - * 应收款账单表(InvoiceBillOrder)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:34  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class InvoiceBaseOrderQueryVO extends BasePageVO implements Serializable {  
23 -  
24 - /**  
25 - * 发票单号  
26 - */  
27 - @NotBlank(message = "发票单号不能为空")  
28 - private String invoiceNo;  
29 -}  
30 -  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAmountInfoVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * 应收款账单 -- 其他金额信息  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceBillAmountInfoVO implements Serializable {  
22 -  
23 - private Long id;  
24 -  
25 - /**  
26 - * 报关单url地址  
27 - */  
28 - private String bgUrl;  
29 -  
30 - /**  
31 - * 实际应收金额  
32 - */  
33 - private BigDecimal actualReceivableAmount;  
34 - /**  
35 - * 实际应付金额1  
36 - */  
37 - private BigDecimal actualPayedAmount1;  
38 - /**  
39 - * 实际应付金额2  
40 - */  
41 - private BigDecimal actualPayedAmount2;  
42 - /**  
43 - * 实际应付金额3  
44 - */  
45 - private BigDecimal actualPayedAmount3;  
46 - /**  
47 - * 其他费用金额  
48 - */  
49 - private BigDecimal otherAmount;  
50 -  
51 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisExportVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * 应收款账单表(InvoiceBillOrder)实体类  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceBillAnalysisExportVO implements Serializable {  
22 -  
23 - private Long id;  
24 -  
25 - /**  
26 - * 客户编码  
27 - */  
28 - private String customerCode;  
29 -  
30 - /**  
31 - * 发票单号  
32 - */  
33 - private String invoiceNo;  
34 -  
35 - /**  
36 - * 客户总价$  
37 - */  
38 - private BigDecimal customerTotalPrice;  
39 -  
40 - /**  
41 - * 发生扣款金额  
42 - */  
43 - private BigDecimal deductAmount;  
44 -  
45 - /**  
46 - * 实际应收金额  
47 - */  
48 - private BigDecimal actualReceivableAmount;  
49 -  
50 - /**  
51 - * 实际应付金额  
52 - */  
53 - private BigDecimal actualPayedAmount;  
54 -  
55 - /**  
56 - * 实际应收 - 实际应付  
57 - * 其他费用金额汇总  
58 - */  
59 - private BigDecimal otherAmount;  
60 -  
61 - /**  
62 - * 实际应收 - 实际应付 - 其他费用金额汇总  
63 - * 其他费用金额合计  
64 - */  
65 - private BigDecimal otherTotalAmount;  
66 -  
67 - /**  
68 - * 必须回款日期  
69 - */  
70 - private String backRefundDate;  
71 -  
72 - /**  
73 - * 实际回款日期  
74 - */  
75 - private String actualRefundDate;  
76 -  
77 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisResultVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -import java.util.List;  
9 -  
10 -/**  
11 - * 应收款账单表(InvoiceBillOrder)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:33  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class InvoiceBillAnalysisResultVO implements Serializable {  
23 -  
24 -  
25 - /**  
26 - * 导出列表  
27 - */  
28 - private List<InvoiceBillAnalysisExportVO> exportVOS;  
29 -  
30 - /**  
31 - * 合计数据  
32 - */  
33 -  
34 - /**  
35 - * 客户总价$  
36 - */  
37 - private BigDecimal customerTotalPrice;  
38 -  
39 - /**  
40 - * 发生扣款金额  
41 - */  
42 - private BigDecimal deductAmount;  
43 -  
44 - /**  
45 - * 实际应收金额  
46 - */  
47 - private BigDecimal actualReceivableAmount;  
48 -  
49 - /**  
50 - * 实际应付金额  
51 - */  
52 - private BigDecimal actualPayedAmount;  
53 -  
54 - /**  
55 - * 实际应收 - 实际应付  
56 - * 其他费用金额汇总  
57 - */  
58 - private BigDecimal otherAmount;  
59 -  
60 - /**  
61 - * 实际应收 - 实际应付 - 其他费用金额汇总  
62 - * 其他费用金额合计  
63 - */  
64 - private BigDecimal otherTotalAmount;  
65 -  
66 - /**  
67 - * 合计数据  
68 - */  
69 -  
70 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 应收款账单 -- 分析  
10 - *  
11 - * @author makejava  
12 - * @since 2024-08-05 16:26:33  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@EqualsAndHashCode(callSuper = false)  
18 -@SuperBuilder  
19 -public class InvoiceBillAnalysisVO extends InvoiceBillOrderQueryVO implements Serializable {  
20 -  
21 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCommitApplyVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 应收款账单 -- 提交审核  
10 - *  
11 - * @author makejava  
12 - * @since 2024-08-05 16:26:33  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@NoArgsConstructor  
18 -@EqualsAndHashCode(callSuper = false)  
19 -@SuperBuilder  
20 -public class InvoiceBillCommitApplyVO implements Serializable {  
21 -  
22 - private Long id;  
23 -  
24 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCreateVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.util.List;  
8 -  
9 -/**  
10 - * 应收款账单表(InvoiceBillOrder)实体类  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceBillCreateVO implements Serializable {  
22 - private static final long serialVersionUID = 543899167451834300L;  
23 -  
24 - private Long id;  
25 -  
26 - /**  
27 - * 发票单号  
28 - */  
29 - private String invoiceNo;  
30 -  
31 - /**  
32 - * 报关单url地址  
33 - */  
34 - private String bgUrl;  
35 -  
36 - /**  
37 - * 必须回款日期  
38 - */  
39 - private String backRefundDate;  
40 -  
41 - /**  
42 - * 订单id集合  
43 - */  
44 - private List<Long> orderIds;  
45 -  
46 -  
47 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillDeductInfoVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * 应收款账单 -- 扣款信息  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceBillDeductInfoVO implements Serializable {  
22 -  
23 - private Long id;  
24 -  
25 - /**  
26 - * 发票单号  
27 - */  
28 - private String invoiceNo;  
29 -  
30 - /**  
31 - * 发生扣款金额  
32 - */  
33 - private BigDecimal deductAmount;  
34 -  
35 - /**  
36 - * 扣款单url地址  
37 - */  
38 - private String deductUrl;  
39 -  
40 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillMappingQueryVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.vo.BasePageVO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import java.io.Serializable;  
8 -import java.util.List;  
9 -  
10 -/**  
11 - * 应收款账单关联订单映射表(InvoiceBillMapping)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:36  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class InvoiceBillMappingQueryVO extends BasePageVO implements Serializable {  
23 - private static final long serialVersionUID = -10772282327497511L;  
24 -  
25 - private List<Long> ids;  
26 -  
27 -  
28 - private Long id;  
29 - /**  
30 - * 发票单号  
31 - */  
32 - private String invoiceNo;  
33 - /**  
34 - * invoice账单id  
35 - */  
36 - private Long invoiceBillId;  
37 - /**  
38 - * 订单id  
39 - */  
40 - private Long orderId;  
41 -  
42 -  
43 -}  
44 -  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillMappingVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 应收款账单关联订单映射表(InvoiceBillMapping)实体类  
10 - *  
11 - * @author makejava  
12 - * @since 2024-08-05 16:26:36  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@NoArgsConstructor  
18 -@EqualsAndHashCode(callSuper = false)  
19 -@SuperBuilder  
20 -public class InvoiceBillMappingVO implements Serializable {  
21 - private static final long serialVersionUID = -55765026730369748L;  
22 -  
23 - private Long id;  
24 - /**  
25 - * 发票单号  
26 - */  
27 - private String invoiceNo;  
28 - /**  
29 - * invoice账单id  
30 - */  
31 - private Long invoiceBillId;  
32 - /**  
33 - * 订单id  
34 - */  
35 - private Long orderId;  
36 -  
37 -  
38 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.vo.BasePageVO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import java.io.Serializable;  
8 -import java.util.List;  
9 -  
10 -/**  
11 - * 应收款账单表(InvoiceBillOrder)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:34  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable {  
23 -  
24 - private List<Long> ids;  
25 -  
26 - /**  
27 - * 发票单号  
28 - */  
29 - private String invoiceNo;  
30 -  
31 - /**  
32 - * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回  
33 - */  
34 - private Integer status;  
35 -  
36 - /**  
37 - * 客户编码  
38 - */  
39 - private String customerCode;  
40 -  
41 - /**  
42 - * 项目号  
43 - */  
44 - private String projectNo;  
45 -  
46 - /**  
47 - * 生产科  
48 - */  
49 - private String productionDepartment;  
50 -  
51 - /**  
52 - * 内部编号  
53 - */  
54 - private String innerNo;  
55 -  
56 - /**  
57 - * 客户po号  
58 - */  
59 - private String customerPo;  
60 -  
61 - /**  
62 - * 开始时间  
63 - */  
64 - private String startTime;  
65 -  
66 - /**  
67 - * 结束时间  
68 - */  
69 - private String endTime;  
70 -}  
71 -  
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * 应收款账单表(InvoiceBillOrder)实体类  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceBillOrderVO implements Serializable {  
22 - private static final long serialVersionUID = 543899167451834300L;  
23 -  
24 - private Long id;  
25 -  
26 - /**  
27 - * 发票单号  
28 - */  
29 - private String invoiceNo;  
30 -  
31 - /**  
32 - * 报关单url地址  
33 - */  
34 - private String bgUrl;  
35 -  
36 - /**  
37 - * 必须回款日期  
38 - */  
39 - private String backRefundDate;  
40 -  
41 - /**  
42 - * 发生扣款金额  
43 - */  
44 - private BigDecimal deductAmount;  
45 -  
46 - /**  
47 - * 扣款单url地址  
48 - */  
49 - private String deductUrl;  
50 -  
51 - /**  
52 - * 实际应收金额  
53 - */  
54 - private BigDecimal actualReceivableAmount;  
55 -  
56 - /**  
57 - * 实际应付金额1  
58 - */  
59 - private BigDecimal actualPayedAmount1;  
60 -  
61 - /**  
62 - * 实际应付金额2  
63 - */  
64 - private BigDecimal actualPayedAmount2;  
65 -  
66 - /**  
67 - * 实际应付金额3  
68 - */  
69 - private BigDecimal actualPayedAmount3;  
70 -  
71 - /**  
72 - * 其他费用金额  
73 - */  
74 - private BigDecimal otherAmount;  
75 -  
76 - /**  
77 - * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回  
78 - */  
79 - private Integer status;  
80 -  
81 -  
82 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceHoldTimeItemVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.dto.order.OrderBaseInfoDO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import java.io.Serializable;  
8 -  
9 -/**  
10 - * 应收款账单 -- holdTime  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceHoldTimeItemVO implements Serializable {  
22 -  
23 - /**  
24 - * 客户编码  
25 - */  
26 - private String customerCode;  
27 -  
28 - /**  
29 - * 订单hold时间  
30 - */  
31 - private String holdTime;  
32 -  
33 - /**  
34 - * 基础订单信息  
35 - */  
36 - private OrderBaseInfoDO baseInfoDO;  
37 -}  
src/main/java/com/order/erp/domain/vo/order/InvoiceOrderBaseItemVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * 应收款账单表(InvoiceBillOrder)实体类  
11 - *  
12 - * @author makejava  
13 - * @since 2024-08-05 16:26:33  
14 - */  
15 -@Data  
16 -@AllArgsConstructor  
17 -@ToString  
18 -@NoArgsConstructor  
19 -@EqualsAndHashCode(callSuper = false)  
20 -@SuperBuilder  
21 -public class InvoiceOrderBaseItemVO implements Serializable {  
22 -  
23 - private Long orderId;  
24 -  
25 - /**  
26 - * invoice编码  
27 - */  
28 - private String invoiceCode;  
29 -  
30 - /**  
31 - * 客户编码  
32 - */  
33 - private String customerCode;  
34 -  
35 - /**  
36 - * 客户总价$  
37 - */  
38 - private BigDecimal customerTotalPrice;  
39 -  
40 -  
41 -}  
src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -/**  
7 - * @Author:ch  
8 - * @createTime:2024-08-07  
9 - */  
10 -@Data  
11 -@AllArgsConstructor  
12 -@ToString  
13 -@NoArgsConstructor  
14 -@EqualsAndHashCode(callSuper = false)  
15 -@SuperBuilder  
16 -public class OrderOpinionLogVO {  
17 - private Long id;  
18 -  
19 - /**  
20 - * 订单id  
21 - */  
22 - private Long orderId;  
23 - /**  
24 - * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)  
25 - */  
26 - private String opinionType;  
27 -  
28 - /**  
29 - * 更新字段  
30 - */  
31 - private String field;  
32 -}  
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillOrderQueryVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import com.order.erp.domain.vo.BasePageVO;  
4 -import lombok.*;  
5 -import lombok.experimental.SuperBuilder;  
6 -  
7 -import java.io.Serializable;  
8 -import java.util.List;  
9 -  
10 -/**  
11 - * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类  
12 - *  
13 - * @author makejava  
14 - * @since 2024-08-05 16:26:35  
15 - */  
16 -@Data  
17 -@AllArgsConstructor  
18 -@ToString  
19 -@NoArgsConstructor  
20 -@EqualsAndHashCode(callSuper = false)  
21 -@SuperBuilder  
22 -public class ProducePaymentCheckBillOrderQueryVO extends BasePageVO implements Serializable {  
23 -  
24 - private List<Long> ids;  
25 -  
26 -  
27 - private Long id;  
28 - /**  
29 - * 生产科对账单  
30 - */  
31 - private String checkNo;  
32 - /**  
33 - * 发票url地址  
34 - */  
35 - private String invoiceUrl;  
36 - /**  
37 - * 扣款单url地址  
38 - */  
39 - private String deductPdfUrl;  
40 - /**  
41 - * 生产科应付款日期  
42 - */  
43 - private String payedDate;  
44 - /**  
45 - * 生产科扣款责任部门  
46 - */  
47 - private String deductDept;  
48 - /**  
49 - * 生产科扣款金额  
50 - */  
51 - private Double deductAmount;  
52 - /**  
53 - * 实际应付金额  
54 - */  
55 - private Double actualPayedAmount;  
56 - /**  
57 - * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回  
58 - */  
59 - private Integer status;  
60 -  
61 -  
62 -}  
63 -  
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillOrderVO.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.domain.vo.order;  
2 -  
3 -import lombok.*;  
4 -import lombok.experimental.SuperBuilder;  
5 -  
6 -import java.io.Serializable;  
7 -  
8 -/**  
9 - * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类  
10 - *  
11 - * @author makejava  
12 - * @since 2024-08-05 16:26:35  
13 - */  
14 -@Data  
15 -@AllArgsConstructor  
16 -@ToString  
17 -@NoArgsConstructor  
18 -@EqualsAndHashCode(callSuper = false)  
19 -@SuperBuilder  
20 -public class ProducePaymentCheckBillOrderVO implements Serializable {  
21 - private static final long serialVersionUID = 239047702576286556L;  
22 -  
23 - private Long id;  
24 - /**  
25 - * 生产科对账单  
26 - */  
27 - private String checkNo;  
28 - /**  
29 - * 发票url地址  
30 - */  
31 - private String invoiceUrl;  
32 - /**  
33 - * 扣款单url地址  
34 - */  
35 - private String deductPdfUrl;  
36 - /**  
37 - * 生产科应付款日期  
38 - */  
39 - private String payedDate;  
40 - /**  
41 - * 生产科扣款责任部门  
42 - */  
43 - private String deductDept;  
44 - /**  
45 - * 生产科扣款金额  
46 - */  
47 - private Double deductAmount;  
48 - /**  
49 - * 实际应付金额  
50 - */  
51 - private Double actualPayedAmount;  
52 - /**  
53 - * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回  
54 - */  
55 - private Integer status;  
56 -  
57 -  
58 -}  
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @edf167a
@@ -132,14 +132,17 @@ public class OrderOverTimeEventJob { @@ -132,14 +132,17 @@ public class OrderOverTimeEventJob {
132 AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>() 132 AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
133 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 133 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
134 .eq(AdminUserDO::getUserName, productionDepartment)); 134 .eq(AdminUserDO::getUserName, productionDepartment));
135 - List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))  
136 - .stream().map(String::trim)  
137 - .collect(Collectors.toList());  
138 - emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),  
139 - productionEmail, orderEventJob);  
140 - redisUtils.set(EmailTemplateEnum.byTemplate(  
141 - eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),  
142 - orderEventJob, 90, TimeUnit.DAYS); 135 + if(Objects.nonNull(productionDepartmentUser) && StringUtils.isNotBlank(productionDepartmentUser.getEmail())){
  136 + List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
  137 + .stream().map(String::trim)
  138 + .collect(Collectors.toList());
  139 + emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
  140 + productionEmail, orderEventJob);
  141 + redisUtils.set(EmailTemplateEnum.byTemplate(
  142 + eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),
  143 + orderEventJob, 90, TimeUnit.DAYS);
  144 + }
  145 +
143 } 146 }
144 } 147 }
145 } else { 148 } else {
src/main/java/com/order/erp/mapper/order/OrderOpinionLogMapper.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.mapper.order;  
2 -  
3 -import com.baomidou.mybatisplus.core.mapper.BaseMapper;  
4 -import com.order.erp.domain.dto.order.OrderOpinionLogDO;  
5 -  
6 -public interface OrderOpinionLogMapper extends BaseMapper<OrderOpinionLogDO> {  
7 -}  
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @edf167a
@@ -215,14 +215,19 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser @@ -215,14 +215,19 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
215 } 215 }
216 //创建生产科角色顺便添加到dictionary的生产科中。 216 //创建生产科角色顺便添加到dictionary的生产科中。
217 if(Constant.SIX==adminUserVO.getRoleId().intValue()){ 217 if(Constant.SIX==adminUserVO.getRoleId().intValue()){
218 - DictionaryVO dictionaryVO = new DictionaryVO();  
219 - dictionaryVO.setRemark("生产科");  
220 - dictionaryVO.setDictCode("productionDepartment");  
221 - dictionaryVO.setDictName("生产科");  
222 - dictionaryVO.setDictValue(adminUserVO.getNickName());  
223 - int count = dictionaryService.count();  
224 - dictionaryVO.setSort(count+1);  
225 - dictionaryService.add(dictionaryVO); 218 + List<DictionaryDO> dictionaryDOList = dictionaryService.list(new LambdaQueryWrapper<DictionaryDO>()
  219 + .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
  220 + .eq(DictionaryDO::getDictCode,RoleEnum.PRODUCE_USER.getName()));
  221 + if(CollectionUtils.isNotEmpty(dictionaryDOList) && !dictionaryDOList.contains(adminUserVO.getNickName())){
  222 + DictionaryVO dictionaryVO = new DictionaryVO();
  223 + dictionaryVO.setRemark("生产科");
  224 + dictionaryVO.setDictCode("productionDepartment");
  225 + dictionaryVO.setDictName("生产科");
  226 + dictionaryVO.setDictValue(adminUserVO.getNickName());
  227 + int count = dictionaryService.count();
  228 + dictionaryVO.setSort(count+1);
  229 + dictionaryService.add(dictionaryVO);
  230 + }
226 } 231 }
227 return ServerResult.success(); 232 return ServerResult.success();
228 } 233 }
src/main/java/com/order/erp/service/order/OrderOpinionLogService.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.service.order;  
2 -  
3 -import com.baomidou.mybatisplus.extension.service.IService;  
4 -import com.order.erp.common.constant.ServerResult;  
5 -import com.order.erp.domain.dto.order.OrderOpinionLogDO;  
6 -import com.order.erp.domain.vo.order.OrderOpinionLogVO;  
7 -  
8 -public interface OrderOpinionLogService extends IService<OrderOpinionLogDO> {  
9 -  
10 - ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo);  
11 -}  
src/main/java/com/order/erp/service/order/impl/OrderOpinionLogServiceImpl.java deleted 100644 → 0
  View file @a441cb7
1 -package com.order.erp.service.order.impl;  
2 -  
3 -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;  
4 -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;  
5 -import com.order.erp.common.constant.Constant;  
6 -import com.order.erp.common.constant.ServerResult;  
7 -import com.order.erp.domain.dto.BaseDO;  
8 -import com.order.erp.domain.dto.order.OrderOpinionLogDO;  
9 -import com.order.erp.domain.vo.order.OrderOpinionLogVO;  
10 -import com.order.erp.mapper.order.OrderOpinionLogMapper;  
11 -import com.order.erp.service.order.OrderOpinionLogService;  
12 -import lombok.extern.slf4j.Slf4j;  
13 -import org.springframework.stereotype.Service;  
14 -  
15 -import java.util.List;  
16 -import java.util.Objects;  
17 -  
18 -  
19 -/**  
20 - * @Author:ch  
21 - * @createTime:2024-08-05  
22 - */  
23 -@Slf4j  
24 -@Service  
25 -public class OrderOpinionLogServiceImpl extends ServiceImpl<OrderOpinionLogMapper, OrderOpinionLogDO> implements OrderOpinionLogService {  
26 - @Override  
27 - public ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo) {  
28 - log.info("orderId"+orderOpinionLogVo.getOrderId());  
29 - System.out.println(orderOpinionLogVo);  
30 - if (Objects.isNull(orderOpinionLogVo.getOrderId())) {  
31 - return ServerResult.fail("OrderId 不能为空");  
32 - }  
33 - List<OrderOpinionLogDO> orderOpinionLogDOList = list(new LambdaQueryWrapper<OrderOpinionLogDO>()  
34 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)  
35 - .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVo.getOrderId())  
36 - .orderByDesc(OrderOpinionLogDO::getId));  
37 - return ServerResult.success(orderOpinionLogDOList);  
38 - }  
39 -}