Compare commits
283 Commits
37ea2b7d78
...
0.8.X
| Author | SHA1 | Date | |
|---|---|---|---|
| 9fd96c3cf5 | |||
| 6265292cbb | |||
| 2490f487fd | |||
| 25b4dfe006 | |||
| faaa5b1b75 | |||
| 1f16c984a8 | |||
| 41557c606b | |||
| a8435a3716 | |||
| 01128d293e | |||
| 2d008f64ea | |||
| 29d99a4f8d | |||
| 416202360b | |||
| fd6c568d19 | |||
| 7efa20dd94 | |||
| b5a269a37a | |||
| 6436d56ab8 | |||
| eda206a4d5 | |||
| 15703216c3 | |||
| 3e640b4a4d | |||
| b5708ea8f0 | |||
| 1167bc117b | |||
| 5f142050a9 | |||
| 26c834780c | |||
| 0fe9bce02a | |||
| 2e79a5beb0 | |||
| 119b9105c7 | |||
| 4aba91abd9 | |||
| 7ec3f49c73 | |||
| 1a0a904903 | |||
| de5a82d0a7 | |||
| a07ced4b25 | |||
| b939052a88 | |||
| c33b27d174 | |||
| 691c8289dd | |||
| ca094574f5 | |||
| f068daba0b | |||
| 0c05455ae3 | |||
| 274671f309 | |||
| b4fba79838 | |||
| 6910278ba7 | |||
| 491eed3dad | |||
| 66838b6c69 | |||
| c8c2523fe7 | |||
| d0afe5eaaf | |||
| 7374b810c1 | |||
| 041e5aef0e | |||
| 6120e87966 | |||
| 5828dbd133 | |||
| ee49fbdcc0 | |||
| 7f1a89eb61 | |||
| 759bbbed63 | |||
| 5b0cb314e4 | |||
| 2fc4bf4043 | |||
| 2fb5a64124 | |||
| 379aa9d44b | |||
| b4a9a48ae6 | |||
| 41716b3430 | |||
| 585017873c | |||
| 605f7b85a1 | |||
| 192a27afbc | |||
| 768b18c22a | |||
| 3719416cbf | |||
| 791be3e1a5 | |||
| 7b7f4b902e | |||
| c547456108 | |||
| 931fc74ed7 | |||
| e7f1e584eb | |||
| b43b44d044 | |||
| d053dd0319 | |||
| 3b1ce45043 | |||
| 5473fbf28f | |||
| 2874f1727a | |||
| a3a4986cb8 | |||
| f525770094 | |||
| 25beef5517 | |||
| e6b1e31bd1 | |||
| 8c3a3eec28 | |||
| 1510f43aee | |||
| cb8fce435c | |||
| 7bb68483e6 | |||
| 696280bd47 | |||
| bdf01feacb | |||
| 120320c800 | |||
| 3db1651efd | |||
| 9d679954fa | |||
| a2844ec54a | |||
| 91ddc8602a | |||
| 22fd3c4a58 | |||
| ceab5d4be3 | |||
| bf8b69d193 | |||
| 7feaf8021b | |||
| 6328b4ac7a | |||
| 183e6d08d8 | |||
| a037c56122 | |||
| 857daa24af | |||
| 0968dcaded | |||
| cced2ff4aa | |||
| f197462b11 | |||
| 9559e5810e | |||
| 92ad229104 | |||
| ee1cb31321 | |||
| f0de25a3a2 | |||
| 0d40774194 | |||
| 948e62daae | |||
| 48d12fe056 | |||
| 6edc6e1100 | |||
| 12ea9b0b83 | |||
| c149216ebd | |||
| 325a93fd84 | |||
| f0656b57d4 | |||
| 9c7d2dca65 | |||
| 36b1e3da82 | |||
| c83eb79d25 | |||
| e0cf4b46b6 | |||
| 00972112d2 | |||
| 2559dc27cb | |||
| 7a0d7e1b12 | |||
| 1cd2cf2b9a | |||
| 98116fa042 | |||
| d3c6790603 | |||
| c1e3fa5141 | |||
| f319308196 | |||
| 185745b7da | |||
| 7440706e2e | |||
| 0adb29139e | |||
| 2148a068f8 | |||
| e1bb9e5431 | |||
| 8b2039f06a | |||
| 9761faa2d2 | |||
| d5f00a4b0b | |||
| b9fb4b4611 | |||
| 7d76ef0c52 | |||
| ea71a6dd93 | |||
| b9b6ae7e79 | |||
| 20a75aec4b | |||
| 3ad7bf40b5 | |||
| 196e628665 | |||
| 7c61c42eb5 | |||
| 1223b634b7 | |||
| 87913ba0a0 | |||
| eab45a8706 | |||
| a9a7a0889e | |||
| cd2e4016a6 | |||
| 87d72b2a0d | |||
| 4342215c00 | |||
| 7bf7d24f29 | |||
| 4da8d8d297 | |||
| c4eab467ee | |||
| fd50118161 | |||
| cc63aa80b2 | |||
| c95ea7db61 | |||
| f50c240bbe | |||
| 66278e635b | |||
| 74d0ba57e2 | |||
| e00d1357b0 | |||
| b9f87c6cc4 | |||
| 7c9c99bf45 | |||
| fdb13b7261 | |||
| 74a3803290 | |||
| 76497eece7 | |||
| d231d3619a | |||
| 20966157c5 | |||
| 59e58e5206 | |||
| 59ceeed4a4 | |||
| fac59f4346 | |||
| f6a74e58ea | |||
| 857a3948d6 | |||
| 47b3fb24b7 | |||
| 97e0df7ae1 | |||
| 7c87670896 | |||
| cd3cc85c0a | |||
| d70bb77755 | |||
| b00db10a37 | |||
| dbeb99d9e5 | |||
| 1a2fc9852d | |||
| 7aaa59cee1 | |||
| cbebd5b6d6 | |||
| 24a9784035 | |||
| de7ec604dd | |||
| 696f6d9ee0 | |||
| 050dd1a965 | |||
| 724c1dd16f | |||
| 0e85153b3d | |||
| af728f8ea6 | |||
| 7e07b6f970 | |||
| 8a0f5e65bb | |||
| 1947a5c2d5 | |||
| d8498728ee | |||
| 53e948b3e0 | |||
| 3ebc0cb86a | |||
| 8059b0a0bb | |||
| 1792196dc7 | |||
| d8051abf8e | |||
| 5e0cb69bb8 | |||
| 37a69b563b | |||
| 66f0b3fdd7 | |||
| 5e0dc848bb | |||
| a5323aea76 | |||
| cac747d158 | |||
| 705d929d6e | |||
| 29c21fd64f | |||
| 5236500f04 | |||
| 600867f386 | |||
| 8183bae824 | |||
| 37d6830947 | |||
| c71dfe3ff2 | |||
| ff139759d4 | |||
| 5176c80344 | |||
| 31f7a9c0cb | |||
| 9d208770d8 | |||
| 31d8d1ee16 | |||
| b4fbb8dfc8 | |||
| 40ebca2573 | |||
| ec08a360a0 | |||
| 977ea2b021 | |||
| e507887a27 | |||
| 12a887e074 | |||
| 577de8eb64 | |||
| 03add7c96b | |||
| 42e5b6dd2b | |||
| 88149561c5 | |||
| 51bb7593c7 | |||
| c34fc1e477 | |||
| 9bd6077599 | |||
| 6fe1f668d3 | |||
| 53b991242c | |||
| 91017f7c84 | |||
| 7b80ef035a | |||
| e54efab7c8 | |||
| 715c1b9728 | |||
| 8723924002 | |||
| cbaa47b34e | |||
| fe24426f59 | |||
| ef04d73e0c | |||
| b7d47a5d9d | |||
| 021c1c908a | |||
| cd3b25fa30 | |||
| 3106b2c530 | |||
| f4e6b24c92 | |||
| d6620e2449 | |||
| b59bb1789e | |||
| 4295a28f33 | |||
| 8572a60044 | |||
| 29328d70e9 | |||
| 12545f7c8b | |||
| 6ec4275088 | |||
| 14dbd633b5 | |||
| 8d68d2bdee | |||
| 6b8eac4139 | |||
| 13780c635b | |||
| a425a9052a | |||
| f64da15bc3 | |||
| b134539e53 | |||
| effc1f6f2e | |||
| ca285f78c6 | |||
| 0cfffcc60d | |||
| 37b2987279 | |||
| 59bdcf96dc | |||
| 8f602d80a9 | |||
| 7bddfad80f | |||
| 8b1d7ed280 | |||
| 285775c733 | |||
| 7e6bc1e8b4 | |||
| bf3967d7b5 | |||
| a0cd885fc7 | |||
| 481188f654 | |||
| c8fe545950 | |||
| 94840b2153 | |||
| c5ce33f71a | |||
| 43f4692a72 | |||
| 9af5284ff3 | |||
| 62da44382a | |||
| 6a5220ad78 | |||
| 3b7ae10499 | |||
| 6044413384 | |||
| 91d1236c37 | |||
| 020863d1ef | |||
| 6832209e98 | |||
| 3a0f729669 | |||
| aad568f320 | |||
| d6099a781f | |||
| e23098b766 | |||
| 5a16a9d2b1 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -62,4 +62,5 @@ nbdist/
|
||||
/tables/
|
||||
*.local.*
|
||||
*.py
|
||||
*.pyc
|
||||
*.pyc
|
||||
*.json
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
---
|
||||
alwaysApply: true
|
||||
scene: git_message
|
||||
---
|
||||
|
||||
使用中文编写提交信息, 提交信息格式为:
|
||||
```
|
||||
<type>(<scope>): <subject>
|
||||
```
|
||||
@@ -129,6 +129,10 @@
|
||||
<artifactId>klp-cost</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.klp</groupId>
|
||||
<artifactId>klp-flow</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
||||
@@ -361,6 +361,15 @@ public class SqlServerApiClient {
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
public ExecuteSqlResponse queryExcoilByHotCoilId(String hotCoilId) {
|
||||
return executeSql(
|
||||
"oracle",
|
||||
"select * from JXPLTCM.PLTCM_PDO_EXCOIL where HOT_COILID = :hotCoilId",
|
||||
singletonParam("hotCoilId", hotCoilId)
|
||||
);
|
||||
}
|
||||
|
||||
public ExecuteSqlResponse queryPlanListByHotCoilIdLike(String hotCoilId, int page, int pageSize) {
|
||||
int endRow = page * pageSize;
|
||||
int startRow = endRow - pageSize;
|
||||
|
||||
@@ -122,7 +122,10 @@ public class SqlServerApiBusinessService {
|
||||
* 计划详情:按热卷号查询。
|
||||
*/
|
||||
public PlanDetailView getPlanByHotCoilId(String hotCoilId) {
|
||||
return PlanDetailView.fromExecuteSqlResponse(hotCoilId, client.queryPlanByHotCoilId(hotCoilId));
|
||||
SqlServerApiClient.ExecuteSqlResponse planResponse = client.queryPlanByHotCoilId(hotCoilId);
|
||||
SqlServerApiClient.ExecuteSqlResponse excoilResponse = null;
|
||||
excoilResponse = client.queryExcoilByHotCoilId(hotCoilId);
|
||||
return PlanDetailView.fromExecuteSqlResponse(hotCoilId, planResponse, excoilResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -249,6 +252,49 @@ public class SqlServerApiBusinessService {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试用:统计 V_VBDA_GAUGE 中各 THICK 列的非空/非零数量,
|
||||
* 用于排查"末架出口厚度恒为 0"问题——确认实际数据落在哪一列。
|
||||
*/
|
||||
public Map<String, Object> getGaugeStats(String matId) {
|
||||
List<Map<String, Object>> rows = asRowList(client.queryGaugeByMatId(matId));
|
||||
String[] cols = {"THICK0", "THICK1", "THICK4", "THICK5",
|
||||
"THICK0REF", "THICK1REF", "THICK4REF", "THICK5REF"};
|
||||
Map<String, Object> stats = new LinkedHashMap<>();
|
||||
for (String col : cols) {
|
||||
long nonNull = 0, nonZero = 0;
|
||||
Double min = null, max = null;
|
||||
for (Map<String, Object> r : rows) {
|
||||
Object raw = r.get(col);
|
||||
if (raw == null) raw = r.get(col.toLowerCase());
|
||||
if (raw == null) continue;
|
||||
nonNull++;
|
||||
Number n = asNumber(raw);
|
||||
if (n == null) continue;
|
||||
double d = n.doubleValue();
|
||||
if (d != 0.0) nonZero++;
|
||||
if (min == null || d < min) min = d;
|
||||
if (max == null || d > max) max = d;
|
||||
}
|
||||
Map<String, Object> info = new LinkedHashMap<>();
|
||||
info.put("nonNullCount", nonNull);
|
||||
info.put("nonZeroCount", nonZero);
|
||||
info.put("min", min);
|
||||
info.put("max", max);
|
||||
stats.put(col, info);
|
||||
}
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("matId", matId);
|
||||
result.put("totalRows", rows.size());
|
||||
result.put("columnStats", stats);
|
||||
List<Map<String, Object>> samples = new ArrayList<>();
|
||||
if (!rows.isEmpty()) samples.add(rows.get(0));
|
||||
if (rows.size() > 1) samples.add(rows.get(rows.size() / 2));
|
||||
if (rows.size() > 2) samples.add(rows.get(rows.size() - 1));
|
||||
result.put("sampleRows", samples);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 轧辊数据:返回全部在辊/备辊数据。
|
||||
*/
|
||||
@@ -378,11 +424,13 @@ public class SqlServerApiBusinessService {
|
||||
private final String coilId;
|
||||
private final List<Map<String, Object>> rows;
|
||||
private final Map<String, Object> firstRow;
|
||||
private final List<Map<String, Object>> excoilRows;
|
||||
|
||||
public PlanDetailView(String coilId, List<Map<String, Object>> rows, Map<String, Object> firstRow) {
|
||||
public PlanDetailView(String coilId, List<Map<String, Object>> rows, Map<String, Object> firstRow, List<Map<String, Object>> excoilRows) {
|
||||
this.coilId = coilId;
|
||||
this.rows = rows;
|
||||
this.firstRow = firstRow;
|
||||
this.excoilRows = excoilRows;
|
||||
}
|
||||
|
||||
public String getCoilId() {
|
||||
@@ -397,10 +445,21 @@ public class SqlServerApiBusinessService {
|
||||
return firstRow;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getExcoilRows() {
|
||||
return excoilRows;
|
||||
}
|
||||
|
||||
public static PlanDetailView fromExecuteSqlResponse(String coilId, SqlServerApiClient.ExecuteSqlResponse response) {
|
||||
List<Map<String, Object>> rows = asRowList(response);
|
||||
Map<String, Object> firstRow = rows.isEmpty() ? Collections.<String, Object>emptyMap() : rows.get(0);
|
||||
return new PlanDetailView(coilId, rows, firstRow);
|
||||
return new PlanDetailView(coilId, rows, firstRow, Collections.<Map<String, Object>>emptyList());
|
||||
}
|
||||
|
||||
public static PlanDetailView fromExecuteSqlResponse(String coilId, SqlServerApiClient.ExecuteSqlResponse response, SqlServerApiClient.ExecuteSqlResponse excoilResponse) {
|
||||
List<Map<String, Object>> rows = asRowList(response);
|
||||
Map<String, Object> firstRow = rows.isEmpty() ? Collections.<String, Object>emptyMap() : rows.get(0);
|
||||
List<Map<String, Object>> excoilRows = asRowList(excoilResponse);
|
||||
return new PlanDetailView(coilId, rows, firstRow, excoilRows);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -94,6 +94,15 @@ public class SqlServerApiController {
|
||||
return R.ok(businessService.getRealtimeData(matId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试用:V_VBDA_GAUGE 各 THICK 列非空/非零统计 + 样本行。
|
||||
* 用于定位"末架出口厚度恒为 0"问题。
|
||||
*/
|
||||
@GetMapping("/test/gauge-stats/{matId}")
|
||||
public R<Map<String, Object>> testGaugeStats(@PathVariable String matId) {
|
||||
return R.ok(businessService.getGaugeStats(matId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 轧辊数据:type / status 均可选,不传则返回全量。
|
||||
*/
|
||||
|
||||
@@ -52,6 +52,11 @@ public class ApsPlanSheetBo extends BaseEntity {
|
||||
*/
|
||||
private String planType;
|
||||
|
||||
/**
|
||||
* 排产文件
|
||||
*/
|
||||
private String apsUrl;
|
||||
|
||||
/**
|
||||
* 排产人
|
||||
*/
|
||||
|
||||
@@ -49,6 +49,10 @@ public class ApsPlanSheet extends BaseEntity {
|
||||
* 排产类型
|
||||
*/
|
||||
private String planType;
|
||||
/**
|
||||
* 排产文件
|
||||
*/
|
||||
private String apsUrl;
|
||||
/**
|
||||
* 排产人
|
||||
*/
|
||||
|
||||
@@ -60,6 +60,12 @@ public class ApsPlanSheetVo {
|
||||
@ExcelProperty(value = "排产类型")
|
||||
private String planType;
|
||||
|
||||
/**
|
||||
* 排产文件
|
||||
*/
|
||||
@ExcelProperty(value = "排产文件")
|
||||
private String apsUrl;
|
||||
|
||||
/**
|
||||
* 排产人
|
||||
*/
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<result property="lineName" column="line_name"/>
|
||||
<result property="planCode" column="plan_code"/>
|
||||
<result property="planType" column="plan_type"/>
|
||||
<result property="apsUrl" column="aps_url"/>
|
||||
<result property="scheduler" column="scheduler"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
@@ -27,6 +28,7 @@
|
||||
s.line_name AS lineName,
|
||||
s.plan_code AS planCode,
|
||||
s.plan_type AS planType,
|
||||
s.aps_url AS apsUrl,
|
||||
s.scheduler AS scheduler,
|
||||
s.remark AS masterRemark,
|
||||
d.remark AS detailRemark,
|
||||
|
||||
@@ -26,10 +26,15 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Excel相关处理
|
||||
@@ -353,4 +358,67 @@ public class ExcelUtil {
|
||||
return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx";
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel(按指定顺序的列导出,使用动态表头)
|
||||
*
|
||||
* @param list 导出数据集合
|
||||
* @param sheetName 工作表的名称
|
||||
* @param orderedFields 按导出顺序排列的Java字段名列表
|
||||
* @param fieldLabelMap Java字段名 -> Excel列头中文名 映射
|
||||
* @param response 响应体
|
||||
*/
|
||||
public static <T> void exportExcelOrdered(List<T> list, String sheetName,
|
||||
List<String> orderedFields,
|
||||
Map<String, String> fieldLabelMap,
|
||||
HttpServletResponse response) {
|
||||
if (orderedFields == null || orderedFields.isEmpty()) {
|
||||
throw new IllegalArgumentException("导出列不能为空");
|
||||
}
|
||||
// 构建动态表头
|
||||
List<List<String>> heads = orderedFields.stream()
|
||||
.map(f -> Collections.singletonList(fieldLabelMap.getOrDefault(f, f)))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 构建数据行
|
||||
List<List<Object>> data = new ArrayList<>(list.size());
|
||||
if (!list.isEmpty()) {
|
||||
Map<String, Field> fieldCache = new HashMap<>();
|
||||
Class<?> clazz = list.get(0).getClass();
|
||||
for (T vo : list) {
|
||||
List<Object> row = new ArrayList<>(orderedFields.size());
|
||||
for (String fieldName : orderedFields) {
|
||||
Field field = fieldCache.computeIfAbsent(fieldName, k -> {
|
||||
try {
|
||||
Field f = clazz.getDeclaredField(k);
|
||||
f.setAccessible(true);
|
||||
return f;
|
||||
} catch (NoSuchFieldException e) {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
try {
|
||||
row.add(field != null ? field.get(vo) : null);
|
||||
} catch (IllegalAccessException e) {
|
||||
row.add(null);
|
||||
}
|
||||
}
|
||||
data.add(row);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
resetResponse(sheetName, response);
|
||||
ServletOutputStream os = response.getOutputStream();
|
||||
EasyExcel.write(os)
|
||||
.head(heads)
|
||||
.autoCloseStream(false)
|
||||
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
|
||||
.registerConverter(new ExcelBigNumberConvert())
|
||||
.sheet(sheetName)
|
||||
.doWrite(data);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("导出Excel异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
package com.klp.cost.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.cost.domain.vo.CostProdMetricResultVo;
|
||||
import com.klp.cost.domain.bo.CostProdMetricResultBo;
|
||||
import com.klp.cost.service.ICostProdMetricResultService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/cost/prodMetricResult")
|
||||
public class CostProdMetricResultController extends BaseController {
|
||||
|
||||
private final ICostProdMetricResultService iCostProdMetricResultService;
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CostProdMetricResultVo> list(CostProdMetricResultBo bo, PageQuery pageQuery) {
|
||||
return iCostProdMetricResultService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出生产指标计算结果列表
|
||||
*/
|
||||
@Log(title = "生产指标计算结果", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CostProdMetricResultBo bo, HttpServletResponse response) {
|
||||
List<CostProdMetricResultVo> list = iCostProdMetricResultService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "生产指标计算结果", CostProdMetricResultVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取生产指标计算结果详细信息
|
||||
*
|
||||
* @param resultId 主键
|
||||
*/
|
||||
@GetMapping("/{resultId}")
|
||||
public R<CostProdMetricResultVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long resultId) {
|
||||
return R.ok(iCostProdMetricResultService.queryById(resultId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产指标计算结果
|
||||
*/
|
||||
@Log(title = "生产指标计算结果", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody CostProdMetricResultBo bo) {
|
||||
return toAjax(iCostProdMetricResultService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量保存生产指标计算结果(先删除再插入)
|
||||
*/
|
||||
@Log(title = "生产指标计算结果", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batch")
|
||||
public R<Void> batchSave(@RequestBody CostProdMetricResultBo bo) {
|
||||
return toAjax(iCostProdMetricResultService.batchSaveWithDelete(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产指标计算结果
|
||||
*/
|
||||
@Log(title = "生产指标计算结果", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CostProdMetricResultBo bo) {
|
||||
return toAjax(iCostProdMetricResultService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产指标计算结果
|
||||
*
|
||||
* @param resultIds 主键串
|
||||
*/
|
||||
@Log(title = "生产指标计算结果", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{resultIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] resultIds) {
|
||||
return toAjax(iCostProdMetricResultService.deleteWithValidByIds(Arrays.asList(resultIds), true));
|
||||
}
|
||||
}
|
||||
@@ -44,6 +44,10 @@ public class CostItem extends BaseEntity {
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 查询条件(JSON格式)
|
||||
*/
|
||||
private String queryCondition;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
|
||||
@@ -42,13 +42,21 @@ public class CostProdMetric extends BaseEntity {
|
||||
*/
|
||||
private String metricFormula;
|
||||
/**
|
||||
* 指标计算结果值
|
||||
* 单价
|
||||
*/
|
||||
private BigDecimal metricValue;
|
||||
/**
|
||||
* 是否使用单价 0=否 1=是
|
||||
*/
|
||||
private Integer usePrice;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String tags;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.klp.cost.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果对象 cost_prod_metric_result
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("cost_prod_metric_result")
|
||||
public class CostProdMetricResult extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "result_id")
|
||||
private Long resultId;
|
||||
/**
|
||||
* 报表ID(关联生产日报)
|
||||
*/
|
||||
private Long reportId;
|
||||
/**
|
||||
* 指标ID(关联cost_prod_metric)
|
||||
*/
|
||||
private Long metricId;
|
||||
/**
|
||||
* 计算日期
|
||||
*/
|
||||
private Date metricDate;
|
||||
/**
|
||||
* 班组
|
||||
*/
|
||||
private String teamGroup;
|
||||
/**
|
||||
* 计算值
|
||||
*/
|
||||
private BigDecimal calcValue;
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String tags;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -47,5 +47,10 @@ public class CostItemBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 查询条件(JSON格式)
|
||||
*/
|
||||
private String queryCondition;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -44,14 +44,23 @@ public class CostProdMetricBo extends BaseEntity {
|
||||
private String metricFormula;
|
||||
|
||||
/**
|
||||
* 指标计算结果值
|
||||
* 单价
|
||||
*/
|
||||
private BigDecimal metricValue;
|
||||
|
||||
/**
|
||||
* 是否使用单价 0=否 1=是
|
||||
*/
|
||||
private Integer usePrice;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String tags;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
package com.klp.cost.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果业务对象 cost_prod_metric_result
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CostProdMetricResultBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long resultId;
|
||||
|
||||
/**
|
||||
* 报表ID(关联生产日报)
|
||||
*/
|
||||
private Long reportId;
|
||||
|
||||
/**
|
||||
* 指标ID(关联cost_prod_metric)
|
||||
*/
|
||||
private Long metricId;
|
||||
|
||||
/**
|
||||
* 计算日期
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date metricDate;
|
||||
|
||||
/**
|
||||
* 班组
|
||||
*/
|
||||
private String teamGroup;
|
||||
|
||||
/**
|
||||
* 计算值
|
||||
*/
|
||||
private BigDecimal calcValue;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String tags;
|
||||
|
||||
/**
|
||||
* 要删除的主键ID集合
|
||||
*/
|
||||
private List<Long> resultIds;
|
||||
|
||||
/**
|
||||
* 要批量插入的数据集合
|
||||
*/
|
||||
private List<CostProdMetricResultBo> prodMetricResultList;
|
||||
|
||||
}
|
||||
@@ -55,5 +55,11 @@ public class CostItemVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 查询条件(JSON格式)
|
||||
*/
|
||||
@ExcelProperty(value = "查询条件(JSON格式)")
|
||||
private String queryCondition;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package com.klp.cost.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 生产指标计算结果视图对象 cost_prod_metric_result
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class CostProdMetricResultVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long resultId;
|
||||
|
||||
/**
|
||||
* 报表ID(关联生产日报)
|
||||
*/
|
||||
@ExcelProperty(value = "报表ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "关=联生产日报")
|
||||
private Long reportId;
|
||||
|
||||
/**
|
||||
* 指标ID(关联cost_prod_metric)
|
||||
*/
|
||||
@ExcelProperty(value = "指标ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "关=联cost_prod_metric")
|
||||
private Long metricId;
|
||||
|
||||
/**
|
||||
* 计算日期
|
||||
*/
|
||||
@ExcelProperty(value = "计算日期")
|
||||
private Date metricDate;
|
||||
|
||||
/**
|
||||
* 班组
|
||||
*/
|
||||
@ExcelProperty(value = "班组")
|
||||
private String teamGroup;
|
||||
|
||||
/**
|
||||
* 计算值
|
||||
*/
|
||||
@ExcelProperty(value = "计算值")
|
||||
private BigDecimal calcValue;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
@ExcelProperty(value = "标签")
|
||||
private String tags;
|
||||
|
||||
|
||||
}
|
||||
@@ -52,16 +52,27 @@ public class CostProdMetricVo {
|
||||
private String metricFormula;
|
||||
|
||||
/**
|
||||
* 指标计算结果值
|
||||
* 单价
|
||||
*/
|
||||
@ExcelProperty(value = "指标计算结果值")
|
||||
@ExcelProperty(value = "单价")
|
||||
private BigDecimal metricValue;
|
||||
|
||||
/**
|
||||
* 是否使用单价 0=否 1=是
|
||||
*/
|
||||
@ExcelProperty(value = "是否使用单价")
|
||||
private Integer usePrice;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
@ExcelProperty(value = "标签")
|
||||
private String tags;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.cost.mapper;
|
||||
|
||||
import com.klp.cost.domain.CostProdMetricResult;
|
||||
import com.klp.cost.domain.vo.CostProdMetricResultVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
public interface CostProdMetricResultMapper extends BaseMapperPlus<CostProdMetricResultMapper, CostProdMetricResult, CostProdMetricResultVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.klp.cost.service;
|
||||
|
||||
import com.klp.cost.domain.CostProdMetricResult;
|
||||
import com.klp.cost.domain.vo.CostProdMetricResultVo;
|
||||
import com.klp.cost.domain.bo.CostProdMetricResultBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
public interface ICostProdMetricResultService {
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果
|
||||
*/
|
||||
CostProdMetricResultVo queryById(Long resultId);
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果列表
|
||||
*/
|
||||
TableDataInfo<CostProdMetricResultVo> queryPageList(CostProdMetricResultBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果列表
|
||||
*/
|
||||
List<CostProdMetricResultVo> queryList(CostProdMetricResultBo bo);
|
||||
|
||||
/**
|
||||
* 新增生产指标计算结果
|
||||
*/
|
||||
Boolean insertByBo(CostProdMetricResultBo bo);
|
||||
|
||||
/**
|
||||
* 修改生产指标计算结果
|
||||
*/
|
||||
Boolean updateByBo(CostProdMetricResultBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除生产指标计算结果信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 批量保存生产指标计算结果(先删除再插入)
|
||||
*/
|
||||
Boolean batchSaveWithDelete(CostProdMetricResultBo bo);
|
||||
}
|
||||
@@ -65,6 +65,7 @@ public class CostItemServiceImpl implements ICostItemService {
|
||||
lqw.like(StringUtils.isNotBlank(bo.getItemName()), CostItem::getItemName, bo.getItemName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCategory()), CostItem::getCategory, bo.getCategory());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CostItem::getUnit, bo.getUnit());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQueryCondition()), CostItem::getQueryCondition, bo.getQueryCondition());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
package com.klp.cost.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.klp.cost.domain.bo.CostProdMetricResultBo;
|
||||
import com.klp.cost.domain.vo.CostProdMetricResultVo;
|
||||
import com.klp.cost.domain.CostProdMetricResult;
|
||||
import com.klp.cost.mapper.CostProdMetricResultMapper;
|
||||
import com.klp.cost.service.ICostProdMetricResultService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 生产指标计算结果Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-17
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class CostProdMetricResultServiceImpl implements ICostProdMetricResultService {
|
||||
|
||||
private final CostProdMetricResultMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果
|
||||
*/
|
||||
@Override
|
||||
public CostProdMetricResultVo queryById(Long resultId){
|
||||
return baseMapper.selectVoById(resultId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<CostProdMetricResultVo> queryPageList(CostProdMetricResultBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<CostProdMetricResult> lqw = buildQueryWrapper(bo);
|
||||
Page<CostProdMetricResultVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产指标计算结果列表
|
||||
*/
|
||||
@Override
|
||||
public List<CostProdMetricResultVo> queryList(CostProdMetricResultBo bo) {
|
||||
LambdaQueryWrapper<CostProdMetricResult> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<CostProdMetricResult> buildQueryWrapper(CostProdMetricResultBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<CostProdMetricResult> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getReportId() != null, CostProdMetricResult::getReportId, bo.getReportId());
|
||||
lqw.eq(bo.getMetricId() != null, CostProdMetricResult::getMetricId, bo.getMetricId());
|
||||
lqw.eq(bo.getMetricDate() != null, CostProdMetricResult::getMetricDate, bo.getMetricDate());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTeamGroup()), CostProdMetricResult::getTeamGroup, bo.getTeamGroup());
|
||||
lqw.eq(bo.getCalcValue() != null, CostProdMetricResult::getCalcValue, bo.getCalcValue());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTags()), CostProdMetricResult::getTags, bo.getTags());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产指标计算结果
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(CostProdMetricResultBo bo) {
|
||||
CostProdMetricResult add = BeanUtil.toBean(bo, CostProdMetricResult.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setResultId(add.getResultId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产指标计算结果
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(CostProdMetricResultBo bo) {
|
||||
CostProdMetricResult update = BeanUtil.toBean(bo, CostProdMetricResult.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(CostProdMetricResult entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除生产指标计算结果
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量保存(先删除再插入)
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean batchSaveWithDelete(CostProdMetricResultBo bo) {
|
||||
if (CollUtil.isNotEmpty(bo.getProdMetricResultList())) {
|
||||
if (CollUtil.isNotEmpty(bo.getResultIds())) {
|
||||
baseMapper.deleteBatchIds(bo.getResultIds());
|
||||
}
|
||||
List<CostProdMetricResult> list = bo.getProdMetricResultList().stream()
|
||||
.map(item -> BeanUtil.toBean(item, CostProdMetricResult.class))
|
||||
.collect(Collectors.toList());
|
||||
return baseMapper.insertBatch(list);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,8 @@ public class CostProdMetricServiceImpl implements ICostProdMetricService {
|
||||
lqw.like(StringUtils.isNotBlank(bo.getMetricName()), CostProdMetric::getMetricName, bo.getMetricName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMetricFormula()), CostProdMetric::getMetricFormula, bo.getMetricFormula());
|
||||
lqw.eq(bo.getMetricValue() != null, CostProdMetric::getMetricValue, bo.getMetricValue());
|
||||
lqw.eq(bo.getUsePrice() != null, CostProdMetric::getUsePrice, bo.getUsePrice());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getTags()), CostProdMetric::getTags, bo.getTags());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,10 @@ public class CostProdReportServiceImpl implements ICostProdReportService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getLineType()), CostProdReport::getLineType, bo.getLineType());
|
||||
lqw.eq(bo.getInputWeight() != null, CostProdReport::getInputWeight, bo.getInputWeight());
|
||||
lqw.eq(bo.getOutputWeight() != null, CostProdReport::getOutputWeight, bo.getOutputWeight());
|
||||
lqw.apply(bo.getReportDate() != null, "DATE_FORMAT(report_date, '%Y-%m') = {0}", bo.getReportDate());
|
||||
if (bo.getReportDate() != null) {
|
||||
String monthStr = new java.text.SimpleDateFormat("yyyy-MM").format(bo.getReportDate());
|
||||
lqw.apply("DATE_FORMAT(report_date, '%Y-%m') = {0}", monthStr);
|
||||
}
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="category" column="category"/>
|
||||
<result property="unit" column="unit"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="queryCondition" column="query_condition"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
|
||||
@@ -11,7 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="metricName" column="metric_name"/>
|
||||
<result property="metricFormula" column="metric_formula"/>
|
||||
<result property="metricValue" column="metric_value"/>
|
||||
<result property="usePrice" column="use_price"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="tags" column="tags"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.cost.mapper.CostProdMetricResultMapper">
|
||||
|
||||
<resultMap type="com.klp.cost.domain.CostProdMetricResult" id="CostProdMetricResultResult">
|
||||
<result property="resultId" column="result_id"/>
|
||||
<result property="reportId" column="report_id"/>
|
||||
<result property="metricId" column="metric_id"/>
|
||||
<result property="metricDate" column="metric_date"/>
|
||||
<result property="teamGroup" column="team_group"/>
|
||||
<result property="calcValue" column="calc_value"/>
|
||||
<result property="tags" column="tags"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -85,6 +85,15 @@ public class CrmSalesReportController extends BaseController {
|
||||
return R.ok(stats);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询省份统计数据
|
||||
*/
|
||||
@GetMapping("/provinceStats")
|
||||
public R<List<CrmSalesReportVo.ProvinceStat>> getProvinceStats(CrmSalesReportBo bo) {
|
||||
List<CrmSalesReportVo.ProvinceStat> stats = iCrmSalesReportService.queryProvinceStats(bo);
|
||||
return R.ok(stats);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出销售报表订单明细
|
||||
*/
|
||||
|
||||
@@ -290,4 +290,35 @@ public class CrmSalesReportVo {
|
||||
@ExcelProperty(value = "销售金额")
|
||||
private BigDecimal salesAmount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 省份统计内部类
|
||||
*/
|
||||
@Data
|
||||
public static class ProvinceStat {
|
||||
|
||||
/**
|
||||
* 省份
|
||||
*/
|
||||
@ExcelProperty(value = "省份")
|
||||
private String province;
|
||||
|
||||
/**
|
||||
* 客户数量
|
||||
*/
|
||||
@ExcelProperty(value = "客户数量")
|
||||
private Integer customerCount;
|
||||
|
||||
/**
|
||||
* 订单数量
|
||||
*/
|
||||
@ExcelProperty(value = "订单数量")
|
||||
private Integer orderCount;
|
||||
|
||||
/**
|
||||
* 销售金额
|
||||
*/
|
||||
@ExcelProperty(value = "销售金额")
|
||||
private BigDecimal salesAmount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,4 +12,9 @@ import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
*/
|
||||
public interface CrmCustomerMapper extends BaseMapperPlus<CrmCustomerMapper, CrmCustomer, CrmCustomerVo> {
|
||||
|
||||
/**
|
||||
* 查询当前最大的customer_code,用于自动生成新编码
|
||||
*/
|
||||
String selectMaxCustomerCode();
|
||||
|
||||
}
|
||||
|
||||
@@ -54,4 +54,12 @@ public interface CrmSalesReportMapper {
|
||||
* @return 行业统计列表
|
||||
*/
|
||||
List<CrmSalesReportVo.IndustryStat> selectIndustryStats(@Param("bo") CrmSalesReportBo bo);
|
||||
|
||||
/**
|
||||
* 查询省份统计数据
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 省份统计列表
|
||||
*/
|
||||
List<CrmSalesReportVo.ProvinceStat> selectProvinceStats(@Param("bo") CrmSalesReportBo bo);
|
||||
}
|
||||
@@ -72,4 +72,12 @@ public interface ICrmSalesReportService {
|
||||
* @return 行业统计列表
|
||||
*/
|
||||
List<CrmSalesReportVo.IndustryStat> queryIndustryStats(CrmSalesReportBo bo);
|
||||
|
||||
/**
|
||||
* 查询省份统计数据
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 省份统计列表
|
||||
*/
|
||||
List<CrmSalesReportVo.ProvinceStat> queryProvinceStats(CrmSalesReportBo bo);
|
||||
}
|
||||
@@ -91,6 +91,25 @@ public class CrmCustomerServiceImpl implements ICrmCustomerService {
|
||||
@Override
|
||||
public Boolean insertByBo(CrmCustomerBo bo) {
|
||||
CrmCustomer add = BeanUtil.toBean(bo, CrmCustomer.class);
|
||||
// 自动生成customer_code:查询最大编码并加1
|
||||
if (StringUtils.isBlank(add.getCustomerCode())) {
|
||||
String maxCode = baseMapper.selectMaxCustomerCode();
|
||||
if (StringUtils.isBlank(maxCode)) {
|
||||
add.setCustomerCode("00001");
|
||||
} else {
|
||||
// 提取末尾数字后缀并递增,支持纯数字("00001")和带前缀("KH00001")两种格式
|
||||
java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("^(.*?)(\\d+)$");
|
||||
java.util.regex.Matcher matcher = pattern.matcher(maxCode);
|
||||
if (matcher.matches()) {
|
||||
String prefix = matcher.group(1);
|
||||
String numStr = matcher.group(2);
|
||||
long num = Long.parseLong(numStr) + 1;
|
||||
add.setCustomerCode(prefix + String.format("%0" + numStr.length() + "d", num));
|
||||
} else {
|
||||
add.setCustomerCode(maxCode + "1");
|
||||
}
|
||||
}
|
||||
}
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
|
||||
@@ -250,11 +250,9 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
||||
qw.eq("co.del_flag", 0);
|
||||
//排序规则:
|
||||
// 1. 置顶优先 (is_top=1 排在前面)
|
||||
// 2. 状态为1(已生效)的排在前面
|
||||
// 3. 创建时间倒序
|
||||
// 2. 合同号倒序(KLPY+年月日+序号,降序最新在前)
|
||||
qw.orderByDesc("co.is_top")
|
||||
.orderByDesc("CASE WHEN co.status = 1 THEN 1 ELSE 0 END")
|
||||
.orderByDesc("co.create_time");
|
||||
.orderByDesc("co.contract_code");
|
||||
return qw;
|
||||
}
|
||||
|
||||
@@ -287,9 +285,37 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(CrmOrderBo bo) {
|
||||
// 查询旧订单获取原销售员和原合同编号,用于判断是否需要同步钢卷
|
||||
CrmOrder oldOrder = null;
|
||||
String oldSalesman = null;
|
||||
String oldContractCode = null;
|
||||
if (bo.getOrderId() != null) {
|
||||
oldOrder = baseMapper.selectById(bo.getOrderId());
|
||||
if (oldOrder != null) {
|
||||
oldSalesman = oldOrder.getSalesman();
|
||||
oldContractCode = oldOrder.getContractCode();
|
||||
}
|
||||
}
|
||||
|
||||
CrmOrder update = BeanUtil.toBean(bo, CrmOrder.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
boolean result = baseMapper.updateById(update) > 0;
|
||||
|
||||
// 如果销售员或合同编号变更,同步更新所有关联钢卷
|
||||
if (result && oldOrder != null) {
|
||||
String newSalesman = update.getSalesman();
|
||||
String newContractCode = update.getContractCode();
|
||||
boolean salesmanChanged = !Objects.equals(oldSalesman, newSalesman);
|
||||
boolean contractCodeChanged = !Objects.equals(oldContractCode, newContractCode);
|
||||
if (salesmanChanged || contractCodeChanged) {
|
||||
coilContractRelMapper.updateCoilSaleNameByOrderId(
|
||||
bo.getOrderId(),
|
||||
StringUtils.isNotBlank(newSalesman) ? newSalesman : oldSalesman,
|
||||
StringUtils.isNotBlank(newContractCode) ? newContractCode : oldContractCode);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -136,4 +136,12 @@ public class CrmSalesReportServiceImpl implements ICrmSalesReportService {
|
||||
public List<CrmSalesReportVo.IndustryStat> queryIndustryStats(CrmSalesReportBo bo) {
|
||||
return baseMapper.selectIndustryStats(bo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询省份统计数据
|
||||
*/
|
||||
@Override
|
||||
public List<CrmSalesReportVo.ProvinceStat> queryProvinceStats(CrmSalesReportBo bo) {
|
||||
return baseMapper.selectProvinceStats(bo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,5 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectMaxCustomerCode" resultType="String">
|
||||
SELECT customer_code FROM crm_customer WHERE del_flag = 0 ORDER BY LENGTH(customer_code) DESC, customer_code DESC LIMIT 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@@ -268,4 +268,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
ORDER BY salesAmount DESC
|
||||
</select>
|
||||
|
||||
<!-- 查询省份统计数据 -->
|
||||
<select id="selectProvinceStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$ProvinceStat">
|
||||
SELECT
|
||||
COALESCE(c.province, '其他') as province,
|
||||
COUNT(DISTINCT c.customer_id) as customerCount,
|
||||
COUNT(o.order_id) as orderCount,
|
||||
COALESCE(SUM(o.order_amount), 0) as salesAmount
|
||||
FROM crm_order o
|
||||
LEFT JOIN crm_customer c ON o.customer_id = c.customer_id
|
||||
<include refid="selectCondition"/>
|
||||
GROUP BY c.province
|
||||
ORDER BY salesAmount DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
23
klp-flow/pom.xml
Normal file
23
klp-flow/pom.xml
Normal file
@@ -0,0 +1,23 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.klp</groupId>
|
||||
<artifactId>klp-oa</artifactId>
|
||||
<version>0.8.3</version>
|
||||
</parent>
|
||||
<artifactId>klp-flow</artifactId>
|
||||
<name>klp-flow</name>
|
||||
<description>流程管理模块</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.klp</groupId>
|
||||
<artifactId>klp-common</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.klp</groupId>
|
||||
<artifactId>klp-wms</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanAbnormalVo;
|
||||
import com.klp.flow.domain.bo.EqpMaintenancePlanAbnormalBo;
|
||||
import com.klp.flow.service.IEqpMaintenancePlanAbnormalService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 维修计划-异常记录关联
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/maintenancePlanAbnormal")
|
||||
public class EqpMaintenancePlanAbnormalController extends BaseController {
|
||||
|
||||
private final IEqpMaintenancePlanAbnormalService iEqpMaintenancePlanAbnormalService;
|
||||
|
||||
/**
|
||||
* 查询维修计划-异常记录关联列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<EqpMaintenancePlanAbnormalVo> list(EqpMaintenancePlanAbnormalBo bo, PageQuery pageQuery) {
|
||||
return iEqpMaintenancePlanAbnormalService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出维修计划-异常记录关联列表
|
||||
*/
|
||||
@Log(title = "维修计划-异常记录关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(EqpMaintenancePlanAbnormalBo bo, HttpServletResponse response) {
|
||||
List<EqpMaintenancePlanAbnormalVo> list = iEqpMaintenancePlanAbnormalService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "维修计划-异常记录关联", EqpMaintenancePlanAbnormalVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修计划-异常记录关联详细信息
|
||||
*
|
||||
* @param relId 主键
|
||||
*/
|
||||
@GetMapping("/{relId}")
|
||||
public R<EqpMaintenancePlanAbnormalVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relId) {
|
||||
return R.ok(iEqpMaintenancePlanAbnormalService.queryById(relId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增维修计划-异常记录关联
|
||||
*/
|
||||
@Log(title = "维修计划-异常记录关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpMaintenancePlanAbnormalBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanAbnormalService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改维修计划-异常记录关联
|
||||
*/
|
||||
@Log(title = "维修计划-异常记录关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMaintenancePlanAbnormalBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanAbnormalService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修计划-异常记录关联
|
||||
*
|
||||
* @param relIds 主键串
|
||||
*/
|
||||
@Log(title = "维修计划-异常记录关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relIds) {
|
||||
return toAjax(iEqpMaintenancePlanAbnormalService.deleteWithValidByIds(Arrays.asList(relIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanVo;
|
||||
import com.klp.flow.domain.bo.EqpMaintenancePlanBo;
|
||||
import com.klp.flow.service.IEqpMaintenancePlanService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 维修计划主
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/maintenancePlan")
|
||||
public class EqpMaintenancePlanController extends BaseController {
|
||||
|
||||
private final IEqpMaintenancePlanService iEqpMaintenancePlanService;
|
||||
|
||||
/**
|
||||
* 查询维修计划主列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<EqpMaintenancePlanVo> list(EqpMaintenancePlanBo bo, PageQuery pageQuery) {
|
||||
return iEqpMaintenancePlanService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出维修计划主列表
|
||||
*/
|
||||
@Log(title = "维修计划主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(EqpMaintenancePlanBo bo, HttpServletResponse response) {
|
||||
List<EqpMaintenancePlanVo> list = iEqpMaintenancePlanService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "维修计划主", EqpMaintenancePlanVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修计划主详细信息
|
||||
*
|
||||
* @param planId 主键
|
||||
*/
|
||||
@GetMapping("/{planId}")
|
||||
public R<EqpMaintenancePlanVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long planId) {
|
||||
return R.ok(iEqpMaintenancePlanService.queryById(planId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增维修计划主
|
||||
*/
|
||||
@Log(title = "维修计划主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpMaintenancePlanBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改维修计划主
|
||||
*/
|
||||
@Log(title = "维修计划主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMaintenancePlanBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修计划主
|
||||
*
|
||||
* @param planIds 主键串
|
||||
*/
|
||||
@Log(title = "维修计划主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{planIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] planIds) {
|
||||
return toAjax(iEqpMaintenancePlanService.deleteWithValidByIds(Arrays.asList(planIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanDetailVo;
|
||||
import com.klp.flow.domain.bo.EqpMaintenancePlanDetailBo;
|
||||
import com.klp.flow.service.IEqpMaintenancePlanDetailService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 维修计划明细
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/maintenancePlanDetail")
|
||||
public class EqpMaintenancePlanDetailController extends BaseController {
|
||||
|
||||
private final IEqpMaintenancePlanDetailService iEqpMaintenancePlanDetailService;
|
||||
|
||||
/**
|
||||
* 查询维修计划明细列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<EqpMaintenancePlanDetailVo> list(EqpMaintenancePlanDetailBo bo, PageQuery pageQuery) {
|
||||
return iEqpMaintenancePlanDetailService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出维修计划明细列表
|
||||
*/
|
||||
@Log(title = "维修计划明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(EqpMaintenancePlanDetailBo bo, HttpServletResponse response) {
|
||||
List<EqpMaintenancePlanDetailVo> list = iEqpMaintenancePlanDetailService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "维修计划明细", EqpMaintenancePlanDetailVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取维修计划明细详细信息
|
||||
*
|
||||
* @param detailId 主键
|
||||
*/
|
||||
@GetMapping("/{detailId}")
|
||||
public R<EqpMaintenancePlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long detailId) {
|
||||
return R.ok(iEqpMaintenancePlanDetailService.queryById(detailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增维修计划明细
|
||||
*/
|
||||
@Log(title = "维修计划明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpMaintenancePlanDetailBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanDetailService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改维修计划明细
|
||||
*/
|
||||
@Log(title = "维修计划明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMaintenancePlanDetailBo bo) {
|
||||
return toAjax(iEqpMaintenancePlanDetailService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修计划明细
|
||||
*
|
||||
* @param detailIds 主键串
|
||||
*/
|
||||
@Log(title = "维修计划明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{detailIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] detailIds) {
|
||||
return toAjax(iEqpMaintenancePlanDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.InvCountDiscrepancyVo;
|
||||
import com.klp.flow.domain.bo.InvCountDiscrepancyBo;
|
||||
import com.klp.flow.service.IInvCountDiscrepancyService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库差异记录
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/countDiscrepancy")
|
||||
public class InvCountDiscrepancyController extends BaseController {
|
||||
|
||||
private final IInvCountDiscrepancyService iInvCountDiscrepancyService;
|
||||
|
||||
/**
|
||||
* 查询盘库差异记录列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<InvCountDiscrepancyVo> list(InvCountDiscrepancyBo bo, PageQuery pageQuery) {
|
||||
return iInvCountDiscrepancyService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库差异记录列表
|
||||
*/
|
||||
@Log(title = "盘库差异记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(InvCountDiscrepancyBo bo, HttpServletResponse response) {
|
||||
List<InvCountDiscrepancyVo> list = iInvCountDiscrepancyService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "盘库差异记录", InvCountDiscrepancyVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库差异记录详细信息
|
||||
*
|
||||
* @param discrepancyId 主键
|
||||
*/
|
||||
@GetMapping("/{discrepancyId}")
|
||||
public R<InvCountDiscrepancyVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long discrepancyId) {
|
||||
return R.ok(iInvCountDiscrepancyService.queryById(discrepancyId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库差异记录
|
||||
*/
|
||||
@Log(title = "盘库差异记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountDiscrepancyBo bo) {
|
||||
return toAjax(iInvCountDiscrepancyService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库差异记录
|
||||
*/
|
||||
@Log(title = "盘库差异记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountDiscrepancyBo bo) {
|
||||
return toAjax(iInvCountDiscrepancyService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库差异记录
|
||||
*
|
||||
* @param discrepancyIds 主键串
|
||||
*/
|
||||
@Log(title = "盘库差异记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{discrepancyIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] discrepancyIds) {
|
||||
return toAjax(iInvCountDiscrepancyService.deleteWithValidByIds(Arrays.asList(discrepancyIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.InvCountPlanVo;
|
||||
import com.klp.flow.domain.bo.InvCountPlanBo;
|
||||
import com.klp.flow.service.IInvCountPlanService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库计划主
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/countPlan")
|
||||
public class InvCountPlanController extends BaseController {
|
||||
|
||||
private final IInvCountPlanService iInvCountPlanService;
|
||||
|
||||
/**
|
||||
* 查询盘库计划主列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<InvCountPlanVo> list(InvCountPlanBo bo, PageQuery pageQuery) {
|
||||
return iInvCountPlanService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库计划主列表
|
||||
*/
|
||||
@Log(title = "盘库计划主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(InvCountPlanBo bo, HttpServletResponse response) {
|
||||
List<InvCountPlanVo> list = iInvCountPlanService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "盘库计划主", InvCountPlanVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库计划主详细信息
|
||||
*
|
||||
* @param planId 主键
|
||||
*/
|
||||
@GetMapping("/{planId}")
|
||||
public R<InvCountPlanVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long planId) {
|
||||
return R.ok(iInvCountPlanService.queryById(planId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库计划主
|
||||
*/
|
||||
@Log(title = "盘库计划主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountPlanBo bo) {
|
||||
return toAjax(iInvCountPlanService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库计划主
|
||||
*/
|
||||
@Log(title = "盘库计划主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountPlanBo bo) {
|
||||
return toAjax(iInvCountPlanService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库计划主
|
||||
*
|
||||
* @param planIds 主键串
|
||||
*/
|
||||
@Log(title = "盘库计划主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{planIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] planIds) {
|
||||
return toAjax(iInvCountPlanService.deleteWithValidByIds(Arrays.asList(planIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.InvCountPlanWarehouseVo;
|
||||
import com.klp.flow.domain.bo.InvCountPlanWarehouseBo;
|
||||
import com.klp.flow.service.IInvCountPlanWarehouseService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库计划-库区关联
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/countPlanWarehouse")
|
||||
public class InvCountPlanWarehouseController extends BaseController {
|
||||
|
||||
private final IInvCountPlanWarehouseService iInvCountPlanWarehouseService;
|
||||
|
||||
/**
|
||||
* 查询盘库计划-库区关联列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<InvCountPlanWarehouseVo> list(InvCountPlanWarehouseBo bo, PageQuery pageQuery) {
|
||||
return iInvCountPlanWarehouseService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库计划-库区关联列表
|
||||
*/
|
||||
@Log(title = "盘库计划-库区关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(InvCountPlanWarehouseBo bo, HttpServletResponse response) {
|
||||
List<InvCountPlanWarehouseVo> list = iInvCountPlanWarehouseService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "盘库计划-库区关联", InvCountPlanWarehouseVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库计划-库区关联详细信息
|
||||
*
|
||||
* @param relId 主键
|
||||
*/
|
||||
@GetMapping("/{relId}")
|
||||
public R<InvCountPlanWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relId) {
|
||||
return R.ok(iInvCountPlanWarehouseService.queryById(relId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库计划-库区关联
|
||||
*/
|
||||
@Log(title = "盘库计划-库区关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody InvCountPlanWarehouseBo bo) {
|
||||
return toAjax(iInvCountPlanWarehouseService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库计划-库区关联
|
||||
*/
|
||||
@Log(title = "盘库计划-库区关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvCountPlanWarehouseBo bo) {
|
||||
return toAjax(iInvCountPlanWarehouseService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库计划-库区关联
|
||||
*
|
||||
* @param relIds 主键串
|
||||
*/
|
||||
@Log(title = "盘库计划-库区关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relIds) {
|
||||
return toAjax(iInvCountPlanWarehouseService.deleteWithValidByIds(Arrays.asList(relIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.SchProdScheduleVo;
|
||||
import com.klp.flow.domain.bo.SchProdScheduleBo;
|
||||
import com.klp.flow.service.ISchProdScheduleService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 排产单主
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/prodSchedule")
|
||||
public class SchProdScheduleController extends BaseController {
|
||||
|
||||
private final ISchProdScheduleService iSchProdScheduleService;
|
||||
|
||||
/**
|
||||
* 查询排产单主列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SchProdScheduleVo> list(SchProdScheduleBo bo, PageQuery pageQuery) {
|
||||
return iSchProdScheduleService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出排产单主列表
|
||||
*/
|
||||
@Log(title = "排产单主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SchProdScheduleBo bo, HttpServletResponse response) {
|
||||
List<SchProdScheduleVo> list = iSchProdScheduleService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "排产单主", SchProdScheduleVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取排产单主详细信息
|
||||
*
|
||||
* @param scheduleId 主键
|
||||
*/
|
||||
@GetMapping("/{scheduleId}")
|
||||
public R<SchProdScheduleVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long scheduleId) {
|
||||
return R.ok(iSchProdScheduleService.queryById(scheduleId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增排产单主
|
||||
*/
|
||||
@Log(title = "排产单主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody SchProdScheduleBo bo) {
|
||||
return toAjax(iSchProdScheduleService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改排产单主
|
||||
*/
|
||||
@Log(title = "排产单主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchProdScheduleBo bo) {
|
||||
return toAjax(iSchProdScheduleService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除排产单主
|
||||
*
|
||||
* @param scheduleIds 主键串
|
||||
*/
|
||||
@Log(title = "排产单主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{scheduleIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] scheduleIds) {
|
||||
return toAjax(iSchProdScheduleService.deleteWithValidByIds(Arrays.asList(scheduleIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.SchProdScheduleDetailVo;
|
||||
import com.klp.flow.domain.bo.SchProdScheduleDetailBo;
|
||||
import com.klp.flow.service.ISchProdScheduleDetailService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 排产单明细
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/prodScheduleDetail")
|
||||
public class SchProdScheduleDetailController extends BaseController {
|
||||
|
||||
private final ISchProdScheduleDetailService iSchProdScheduleDetailService;
|
||||
|
||||
/**
|
||||
* 查询排产单明细列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SchProdScheduleDetailVo> list(SchProdScheduleDetailBo bo, PageQuery pageQuery) {
|
||||
return iSchProdScheduleDetailService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出排产单明细列表
|
||||
*/
|
||||
@Log(title = "排产单明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SchProdScheduleDetailBo bo, HttpServletResponse response) {
|
||||
List<SchProdScheduleDetailVo> list = iSchProdScheduleDetailService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "排产单明细", SchProdScheduleDetailVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取排产单明细详细信息
|
||||
*
|
||||
* @param scheduleDetailId 主键
|
||||
*/
|
||||
@GetMapping("/{scheduleDetailId}")
|
||||
public R<SchProdScheduleDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long scheduleDetailId) {
|
||||
return R.ok(iSchProdScheduleDetailService.queryById(scheduleDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增排产单明细
|
||||
*/
|
||||
@Log(title = "排产单明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody SchProdScheduleDetailBo bo) {
|
||||
return toAjax(iSchProdScheduleDetailService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改排产单明细
|
||||
*/
|
||||
@Log(title = "排产单明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchProdScheduleDetailBo bo) {
|
||||
return toAjax(iSchProdScheduleDetailService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除排产单明细
|
||||
*
|
||||
* @param scheduleDetailIds 主键串
|
||||
*/
|
||||
@Log(title = "排产单明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{scheduleDetailIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] scheduleDetailIds) {
|
||||
return toAjax(iSchProdScheduleDetailService.deleteWithValidByIds(Arrays.asList(scheduleDetailIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.SchSaleScheduleRelVo;
|
||||
import com.klp.flow.domain.bo.SchSaleScheduleRelBo;
|
||||
import com.klp.flow.service.ISchSaleScheduleRelService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 销售订单-排产单多对多关联
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/saleScheduleRel")
|
||||
public class SchSaleScheduleRelController extends BaseController {
|
||||
|
||||
private final ISchSaleScheduleRelService iSchSaleScheduleRelService;
|
||||
|
||||
/**
|
||||
* 查询销售订单-排产单多对多关联列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SchSaleScheduleRelVo> list(SchSaleScheduleRelBo bo, PageQuery pageQuery) {
|
||||
return iSchSaleScheduleRelService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出销售订单-排产单多对多关联列表
|
||||
*/
|
||||
@Log(title = "销售订单-排产单多对多关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SchSaleScheduleRelBo bo, HttpServletResponse response) {
|
||||
List<SchSaleScheduleRelVo> list = iSchSaleScheduleRelService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "销售订单-排产单多对多关联", SchSaleScheduleRelVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取销售订单-排产单多对多关联详细信息
|
||||
*
|
||||
* @param relId 主键
|
||||
*/
|
||||
@GetMapping("/{relId}")
|
||||
public R<SchSaleScheduleRelVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relId) {
|
||||
return R.ok(iSchSaleScheduleRelService.queryById(relId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增销售订单-排产单多对多关联
|
||||
*/
|
||||
@Log(title = "销售订单-排产单多对多关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody SchSaleScheduleRelBo bo) {
|
||||
return toAjax(iSchSaleScheduleRelService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改销售订单-排产单多对多关联
|
||||
*/
|
||||
@Log(title = "销售订单-排产单多对多关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchSaleScheduleRelBo bo) {
|
||||
return toAjax(iSchSaleScheduleRelService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除销售订单-排产单多对多关联
|
||||
*
|
||||
* @param relIds 主键串
|
||||
*/
|
||||
@Log(title = "销售订单-排产单多对多关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relIds) {
|
||||
return toAjax(iSchSaleScheduleRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.TsAcceptCoilRelVo;
|
||||
import com.klp.flow.domain.bo.TsAcceptCoilRelBo;
|
||||
import com.klp.flow.service.ITsAcceptCoilRelService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 受理单关联钢卷中间
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/acceptCoilRel")
|
||||
public class TsAcceptCoilRelController extends BaseController {
|
||||
|
||||
private final ITsAcceptCoilRelService iTsAcceptCoilRelService;
|
||||
|
||||
/**
|
||||
* 查询受理单关联钢卷中间列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TsAcceptCoilRelVo> list(TsAcceptCoilRelBo bo, PageQuery pageQuery) {
|
||||
return iTsAcceptCoilRelService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出受理单关联钢卷中间列表
|
||||
*/
|
||||
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(TsAcceptCoilRelBo bo, HttpServletResponse response) {
|
||||
List<TsAcceptCoilRelVo> list = iTsAcceptCoilRelService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "受理单关联钢卷中间", TsAcceptCoilRelVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取受理单关联钢卷中间详细信息
|
||||
*
|
||||
* @param relId 主键
|
||||
*/
|
||||
@GetMapping("/{relId}")
|
||||
public R<TsAcceptCoilRelVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relId) {
|
||||
return R.ok(iTsAcceptCoilRelService.queryById(relId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增受理单关联钢卷中间
|
||||
*/
|
||||
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsAcceptCoilRelBo bo) {
|
||||
return toAjax(iTsAcceptCoilRelService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改受理单关联钢卷中间
|
||||
*/
|
||||
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsAcceptCoilRelBo bo) {
|
||||
return toAjax(iTsAcceptCoilRelService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除受理单关联钢卷中间
|
||||
*
|
||||
* @param relIds 主键串
|
||||
*/
|
||||
@Log(title = "受理单关联钢卷中间", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relIds) {
|
||||
return toAjax(iTsAcceptCoilRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.TsComplaintAcceptVo;
|
||||
import com.klp.flow.domain.bo.TsComplaintAcceptBo;
|
||||
import com.klp.flow.service.ITsComplaintAcceptService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 投诉受理单主
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/complaintAccept")
|
||||
public class TsComplaintAcceptController extends BaseController {
|
||||
|
||||
private final ITsComplaintAcceptService iTsComplaintAcceptService;
|
||||
|
||||
/**
|
||||
* 查询投诉受理单主列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TsComplaintAcceptVo> list(TsComplaintAcceptBo bo, PageQuery pageQuery) {
|
||||
return iTsComplaintAcceptService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出投诉受理单主列表
|
||||
*/
|
||||
@Log(title = "投诉受理单主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(TsComplaintAcceptBo bo, HttpServletResponse response) {
|
||||
List<TsComplaintAcceptVo> list = iTsComplaintAcceptService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "投诉受理单主", TsComplaintAcceptVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取投诉受理单主详细信息
|
||||
*
|
||||
* @param acceptId 主键
|
||||
*/
|
||||
@GetMapping("/{acceptId}")
|
||||
public R<TsComplaintAcceptVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long acceptId) {
|
||||
return R.ok(iTsComplaintAcceptService.queryById(acceptId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增投诉受理单主
|
||||
*/
|
||||
@Log(title = "投诉受理单主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsComplaintAcceptBo bo) {
|
||||
return toAjax(iTsComplaintAcceptService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改投诉受理单主
|
||||
*/
|
||||
@Log(title = "投诉受理单主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsComplaintAcceptBo bo) {
|
||||
return toAjax(iTsComplaintAcceptService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除投诉受理单主
|
||||
*
|
||||
* @param acceptIds 主键串
|
||||
*/
|
||||
@Log(title = "投诉受理单主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{acceptIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] acceptIds) {
|
||||
return toAjax(iTsComplaintAcceptService.deleteWithValidByIds(Arrays.asList(acceptIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 意见下发:修改flow_status=2,按字典部门创建代办任务
|
||||
*
|
||||
* @param acceptId 受理单ID
|
||||
*/
|
||||
@Log(title = "意见下发", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/opinionDispatch/{acceptId}")
|
||||
public R<Void> opinionDispatch(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long acceptId) {
|
||||
return toAjax(iTsComplaintAcceptService.opinionDispatch(acceptId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 反馈下发:修改flow_status=4,按字典部门创建执行反馈记录
|
||||
*
|
||||
* @param acceptId 受理单ID
|
||||
*/
|
||||
@Log(title = "反馈下发", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/feedbackDispatch")
|
||||
public R<Void> feedbackDispatch(@RequestParam Long acceptId,
|
||||
@RequestParam String deptIds) {
|
||||
List<Long> deptIdList = Arrays.stream(deptIds.split(",")).map(Long::parseLong).collect(Collectors.toList());
|
||||
return toAjax(iTsComplaintAcceptService.feedbackDispatch(acceptId, deptIdList));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.TsComplaintTaskVo;
|
||||
import com.klp.flow.domain.bo.TsComplaintTaskBo;
|
||||
import com.klp.flow.service.ITsComplaintTaskService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 各部门投诉代办任务&意见
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/complaintTask")
|
||||
public class TsComplaintTaskController extends BaseController {
|
||||
|
||||
private final ITsComplaintTaskService iTsComplaintTaskService;
|
||||
|
||||
/**
|
||||
* 查询各部门投诉代办任务&意见列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TsComplaintTaskVo> list(TsComplaintTaskBo bo, PageQuery pageQuery) {
|
||||
return iTsComplaintTaskService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出各部门投诉代办任务&意见列表
|
||||
*/
|
||||
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(TsComplaintTaskBo bo, HttpServletResponse response) {
|
||||
List<TsComplaintTaskVo> list = iTsComplaintTaskService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "各部门投诉代办任务&意见", TsComplaintTaskVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取各部门投诉代办任务&意见详细信息
|
||||
*
|
||||
* @param taskId 主键
|
||||
*/
|
||||
@GetMapping("/{taskId}")
|
||||
public R<TsComplaintTaskVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long taskId) {
|
||||
return R.ok(iTsComplaintTaskService.queryById(taskId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增各部门投诉代办任务&意见
|
||||
*/
|
||||
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsComplaintTaskBo bo) {
|
||||
return toAjax(iTsComplaintTaskService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改各部门投诉代办任务&意见
|
||||
*/
|
||||
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsComplaintTaskBo bo) {
|
||||
return toAjax(iTsComplaintTaskService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除各部门投诉代办任务&意见
|
||||
*
|
||||
* @param taskIds 主键串
|
||||
*/
|
||||
@Log(title = "各部门投诉代办任务&意见", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{taskIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] taskIds) {
|
||||
return toAjax(iTsComplaintTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.flow.domain.vo.TsPlanExecuteRelVo;
|
||||
import com.klp.flow.domain.bo.TsPlanExecuteRelBo;
|
||||
import com.klp.flow.service.ITsPlanExecuteRelService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 最终方案下发部门及执行反馈
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/flow/planExecuteRel")
|
||||
public class TsPlanExecuteRelController extends BaseController {
|
||||
|
||||
private final ITsPlanExecuteRelService iTsPlanExecuteRelService;
|
||||
|
||||
/**
|
||||
* 查询最终方案下发部门及执行反馈列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TsPlanExecuteRelVo> list(TsPlanExecuteRelBo bo, PageQuery pageQuery) {
|
||||
return iTsPlanExecuteRelService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出最终方案下发部门及执行反馈列表
|
||||
*/
|
||||
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(TsPlanExecuteRelBo bo, HttpServletResponse response) {
|
||||
List<TsPlanExecuteRelVo> list = iTsPlanExecuteRelService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "最终方案下发部门及执行反馈", TsPlanExecuteRelVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取最终方案下发部门及执行反馈详细信息
|
||||
*
|
||||
* @param relId 主键
|
||||
*/
|
||||
@GetMapping("/{relId}")
|
||||
public R<TsPlanExecuteRelVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relId) {
|
||||
return R.ok(iTsPlanExecuteRelService.queryById(relId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增最终方案下发部门及执行反馈
|
||||
*/
|
||||
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody TsPlanExecuteRelBo bo) {
|
||||
return toAjax(iTsPlanExecuteRelService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改最终方案下发部门及执行反馈
|
||||
*/
|
||||
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TsPlanExecuteRelBo bo) {
|
||||
return toAjax(iTsPlanExecuteRelService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除最终方案下发部门及执行反馈
|
||||
*
|
||||
* @param relIds 主键串
|
||||
*/
|
||||
@Log(title = "最终方案下发部门及执行反馈", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relIds) {
|
||||
return toAjax(iTsPlanExecuteRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 维修计划主对象 eqp_maintenance_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("eqp_maintenance_plan")
|
||||
public class EqpMaintenancePlan extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 计划ID
|
||||
*/
|
||||
@TableId(value = "plan_id")
|
||||
private Long planId;
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
private String planNo;
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
private String planName;
|
||||
/**
|
||||
* 维修类型:1=定期保养 2=安全整改 3=专项检修 4=故障维修
|
||||
*/
|
||||
private Long repairType;
|
||||
/**
|
||||
* 优先级:1=普通 2=重要
|
||||
*/
|
||||
private Long priorityLevel;
|
||||
/**
|
||||
* 计划执行状态:1=待维修,2=维修中,3=已完成,4=已取消
|
||||
*/
|
||||
private Long planStatus;
|
||||
/**
|
||||
* 审批状态:0=草稿 1=待审批 2=已审批 3=已驳回
|
||||
*/
|
||||
private Long approvalStatus;
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
private Date plannedStartTime;
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
private Date plannedEndTime;
|
||||
/**
|
||||
* 负责部门
|
||||
*/
|
||||
private String dutyDept;
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
private String planOwner;
|
||||
/**
|
||||
* 预算金额(元)
|
||||
*/
|
||||
private BigDecimal budgetAmount;
|
||||
/**
|
||||
* 计划说明
|
||||
*/
|
||||
private String planDescription;
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
private Date actualCompleteTime;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 维修计划-异常记录关联对象 eqp_maintenance_plan_abnormal
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("eqp_maintenance_plan_abnormal")
|
||||
public class EqpMaintenancePlanAbnormal extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 关联ID
|
||||
*/
|
||||
@TableId(value = "rel_id")
|
||||
private Long relId;
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
/**
|
||||
* 巡检记录ID(eqp_equipment_inspection_record.record_id,run_status=2 异常记录)
|
||||
*/
|
||||
private Long recordId;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 维修计划明细对象 eqp_maintenance_plan_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("eqp_maintenance_plan_detail")
|
||||
public class EqpMaintenancePlanDetail extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
@TableId(value = "detail_id")
|
||||
private Long detailId;
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
/**
|
||||
* 巡检记录ID(来源异常工单)
|
||||
*/
|
||||
private Long recordId;
|
||||
/**
|
||||
* 设备ID(用户手动选择,关联 eqp_equipment_management.equipment_id)
|
||||
*/
|
||||
private Long equipmentId;
|
||||
/**
|
||||
* 产线名称
|
||||
*/
|
||||
private String productionLine;
|
||||
/**
|
||||
* 设备部件名称
|
||||
*/
|
||||
private String componentName;
|
||||
/**
|
||||
* 单条维修项计划执行日期
|
||||
*/
|
||||
private Date itemPlanDate;
|
||||
/**
|
||||
* 明细类型:0=保养 1=维修
|
||||
*/
|
||||
private Long maintenanceCategory;
|
||||
/**
|
||||
* 明细完成状态:0=未开始 1=进行中 2=已完成
|
||||
*/
|
||||
private Long detailStatus;
|
||||
/**
|
||||
* 维修内容描述
|
||||
*/
|
||||
private String repairContent;
|
||||
/**
|
||||
* 维修负责人
|
||||
*/
|
||||
private String repairUser;
|
||||
/**
|
||||
* 完成时间(打勾时记录)
|
||||
*/
|
||||
private Date completeTime;
|
||||
/**
|
||||
* 实际支出金额(元)
|
||||
*/
|
||||
private BigDecimal actualCost;
|
||||
/**
|
||||
* 完成进度百分比(0-100)
|
||||
*/
|
||||
private Long progressRate;
|
||||
/**
|
||||
* 目标厂家
|
||||
*/
|
||||
private String targetManufacturer;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库差异记录对象 inv_count_discrepancy
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("inv_count_discrepancy")
|
||||
public class InvCountDiscrepancy extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "discrepancy_id")
|
||||
private Long discrepancyId;
|
||||
/**
|
||||
* 盘库计划明细ID
|
||||
*/
|
||||
private Long relId;
|
||||
/**
|
||||
* 差异类型:1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
|
||||
*/
|
||||
private Integer discrepancyType;
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
private String enterCoilNo;
|
||||
/**
|
||||
* 差异详情(JSON:含系统值、实盘值对比)
|
||||
*/
|
||||
private String discrepancyDetail;
|
||||
/**
|
||||
* 原因分析
|
||||
*/
|
||||
private String reasonAnalysis;
|
||||
/**
|
||||
* 处理建议
|
||||
*/
|
||||
private String processSuggestion;
|
||||
/**
|
||||
* 处理结果
|
||||
*/
|
||||
private String processResult;
|
||||
/**
|
||||
* 处理状态:0=待处理, 1=处理中, 2=已处理
|
||||
*/
|
||||
private Integer processStatus;
|
||||
/**
|
||||
* 处理人ID
|
||||
*/
|
||||
private Long processUserId;
|
||||
/**
|
||||
* 处理人姓名
|
||||
*/
|
||||
private String processUserName;
|
||||
/**
|
||||
* 处理时间
|
||||
*/
|
||||
private Date processTime;
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
private String attachFile;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
87
klp-flow/src/main/java/com/klp/flow/domain/InvCountPlan.java
Normal file
87
klp-flow/src/main/java/com/klp/flow/domain/InvCountPlan.java
Normal file
@@ -0,0 +1,87 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库计划主对象 inv_count_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("inv_count_plan")
|
||||
public class InvCountPlan extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "plan_id")
|
||||
private Long planId;
|
||||
/**
|
||||
* 盘库计划编号(如 PD-20260622-001)
|
||||
*/
|
||||
private String planCode;
|
||||
/**
|
||||
* 盘库计划名称
|
||||
*/
|
||||
private String planName;
|
||||
/**
|
||||
* 盘库日期
|
||||
*/
|
||||
private Date countDate;
|
||||
/**
|
||||
* 截止时间
|
||||
*/
|
||||
private Date deadlineTime;
|
||||
/**
|
||||
* 盘点人ID
|
||||
*/
|
||||
private Long countUserId;
|
||||
/**
|
||||
* 盘点人姓名
|
||||
*/
|
||||
private String countUserName;
|
||||
/**
|
||||
* 负责人ID
|
||||
*/
|
||||
private Long principalUserId;
|
||||
/**
|
||||
* 负责人姓名
|
||||
*/
|
||||
private String principalUserName;
|
||||
/**
|
||||
* 参与人员ID列表(逗号分隔)
|
||||
*/
|
||||
private String participantIds;
|
||||
/**
|
||||
* 参与人员姓名列表(逗号分隔)
|
||||
*/
|
||||
private String participantNames;
|
||||
/**
|
||||
* 计划状态:0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
|
||||
*/
|
||||
private Integer planStatus;
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
private String attachFile;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库计划-库区关联对象 inv_count_plan_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("inv_count_plan_warehouse")
|
||||
public class InvCountPlanWarehouse extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "rel_id")
|
||||
private Long relId;
|
||||
/**
|
||||
* 盘库计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
/**
|
||||
* 逻辑库区ID
|
||||
*/
|
||||
private Long warehouseId;
|
||||
/**
|
||||
* 逻辑库区名称(冗余)
|
||||
*/
|
||||
private String warehouseName;
|
||||
/**
|
||||
* 实际库区ID
|
||||
*/
|
||||
private Long actualWarehouseId;
|
||||
/**
|
||||
* 实际库区名称(冗余)
|
||||
*/
|
||||
private String actualWarehouseName;
|
||||
/**
|
||||
* 系统钢卷数量
|
||||
*/
|
||||
private Long systemCoilCount;
|
||||
/**
|
||||
* 系统总重量(kg)
|
||||
*/
|
||||
private BigDecimal systemTotalWeight;
|
||||
/**
|
||||
* 实际盘点数量
|
||||
*/
|
||||
private Long actualCoilCount;
|
||||
/**
|
||||
* 实际盘点总重量(kg)
|
||||
*/
|
||||
private BigDecimal actualTotalWeight;
|
||||
/**
|
||||
* 是否账实一致(0=不一致, 1=一致, NULL=未盘点)
|
||||
*/
|
||||
private Integer isConsistent;
|
||||
/**
|
||||
* 出入库记录查询起始时间
|
||||
*/
|
||||
private Date ioStartTime;
|
||||
/**
|
||||
* 出入库记录查询截止时间
|
||||
*/
|
||||
private Date ioEndTime;
|
||||
/**
|
||||
* 出入库记录快照(JSON)
|
||||
*/
|
||||
private String snapshotIoRecord;
|
||||
/**
|
||||
* 逻辑库区钢卷明细快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilLogic;
|
||||
/**
|
||||
* 实际库区钢卷明细快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilActual;
|
||||
/**
|
||||
* 钢卷数量统计快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilStats;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
140
klp-flow/src/main/java/com/klp/flow/domain/SchProdSchedule.java
Normal file
140
klp-flow/src/main/java/com/klp/flow/domain/SchProdSchedule.java
Normal file
@@ -0,0 +1,140 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 排产单主对象 sch_prod_schedule
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("sch_prod_schedule")
|
||||
public class SchProdSchedule extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 排产单主键ID
|
||||
*/
|
||||
@TableId(value = "schedule_id")
|
||||
private Long scheduleId;
|
||||
/**
|
||||
* 排产单号(唯一标识,钢卷关联依据)
|
||||
*/
|
||||
private String scheduleNo;
|
||||
/**
|
||||
* 生产日期(和合同号组成业务关联键)
|
||||
*/
|
||||
private Date prodDate;
|
||||
/**
|
||||
* 排产状态:0草稿 1待审核 2已下达 3已退回
|
||||
*/
|
||||
private Long scheduleStatus;
|
||||
/**
|
||||
* 排产总计划吨数
|
||||
*/
|
||||
private BigDecimal totalPlanWeight;
|
||||
/**
|
||||
* 关联销售合同号
|
||||
*/
|
||||
private String relContractNo;
|
||||
/**
|
||||
* 业务员
|
||||
*/
|
||||
private String businessUser;
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
private String businessPhone;
|
||||
/**
|
||||
* 订单日期
|
||||
*/
|
||||
private Date orderDate;
|
||||
/**
|
||||
* 订货单位
|
||||
*/
|
||||
private String customerName;
|
||||
/**
|
||||
* 交货期(天)
|
||||
*/
|
||||
private Long deliveryCycle;
|
||||
/**
|
||||
* 产品用途
|
||||
*/
|
||||
private String usePurpose;
|
||||
/**
|
||||
* 品名:冷硬钢卷/镀锌钢卷/冷轧钢卷/镀铬钢卷
|
||||
*/
|
||||
private String productType;
|
||||
/**
|
||||
* 厚度公差
|
||||
*/
|
||||
private String thicknessTolerance;
|
||||
/**
|
||||
* 宽度公差
|
||||
*/
|
||||
private String widthTolerance;
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
private String surfaceQuality;
|
||||
/**
|
||||
* 表面处理
|
||||
*/
|
||||
private String surfaceTreatment;
|
||||
/**
|
||||
* 内径尺寸
|
||||
*/
|
||||
private String innerDiameter;
|
||||
/**
|
||||
* 外径要求
|
||||
*/
|
||||
private String outerDiameter;
|
||||
/**
|
||||
* 包装要求
|
||||
*/
|
||||
private String packReq;
|
||||
/**
|
||||
* 切边要求
|
||||
*/
|
||||
private String cutEdgeReq;
|
||||
/**
|
||||
* 单件重量
|
||||
*/
|
||||
private String singleCoilWeight;
|
||||
/**
|
||||
* 交货重量偏差
|
||||
*/
|
||||
private String weightDeviation;
|
||||
/**
|
||||
* 其他技术要求
|
||||
*/
|
||||
private String otherTechReq;
|
||||
/**
|
||||
* 付款情况说明
|
||||
*/
|
||||
private String paymentDesc;
|
||||
/**
|
||||
* 退回原因
|
||||
*/
|
||||
private String returnReason;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 排产单明细对象 sch_prod_schedule_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("sch_prod_schedule_detail")
|
||||
public class SchProdScheduleDetail extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 排产明细ID
|
||||
*/
|
||||
@TableId(value = "schedule_detail_id")
|
||||
private Long scheduleDetailId;
|
||||
/**
|
||||
* 排产单主表ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
/**
|
||||
* 来源销售订单明细ID(溯源原始订单规格)
|
||||
*/
|
||||
private Long orderDetailId;
|
||||
/**
|
||||
* 规格 例:1.0X1250
|
||||
*/
|
||||
private String spec;
|
||||
/**
|
||||
* 材质 DX51D
|
||||
*/
|
||||
private String material;
|
||||
/**
|
||||
* 本次排产吨数(数量),可审核修改
|
||||
*/
|
||||
private BigDecimal scheduleWeight;
|
||||
/**
|
||||
* 品名
|
||||
*/
|
||||
private String productType;
|
||||
/**
|
||||
* 单行排产备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 销售订单-排产单多对多关联对象 sch_sale_schedule_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("sch_sale_schedule_rel")
|
||||
public class SchSaleScheduleRel extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 关联主键ID
|
||||
*/
|
||||
@TableId(value = "rel_id")
|
||||
private Long relId;
|
||||
/**
|
||||
* 销售订单ID
|
||||
*/
|
||||
private Long orderId;
|
||||
/**
|
||||
* 排产单ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
/**
|
||||
* 本次排产占用该订单重量
|
||||
*/
|
||||
private BigDecimal relWeight;
|
||||
/**
|
||||
* 关联备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0正常 2删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 受理单关联钢卷中间对象 ts_accept_coil_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("ts_accept_coil_rel")
|
||||
public class TsAcceptCoilRel extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(value = "rel_id")
|
||||
private Long relId;
|
||||
/**
|
||||
* 投诉受理单ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 投诉受理单主对象 ts_complaint_accept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("ts_complaint_accept")
|
||||
public class TsComplaintAccept extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 受理单主键
|
||||
*/
|
||||
@TableId(value = "accept_id")
|
||||
private Long acceptId;
|
||||
/**
|
||||
* 投诉编号 TS-2026-001
|
||||
*/
|
||||
private String complaintNo;
|
||||
/**
|
||||
* 投诉日期
|
||||
*/
|
||||
private Date complaintDate;
|
||||
/**
|
||||
* 投诉情况描述
|
||||
*/
|
||||
private String complaintContent;
|
||||
/**
|
||||
* 客户诉求
|
||||
*/
|
||||
private String customerDemand;
|
||||
/**
|
||||
* 客户照片凭证等
|
||||
*/
|
||||
private String file;
|
||||
/**
|
||||
* 审核状态 0待审核 1已通过 2未通过
|
||||
*/
|
||||
private Long auditStatus;
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
private String auditOpinion;
|
||||
/**
|
||||
* 审核人ID
|
||||
*/
|
||||
private Long auditUserId;
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private Date auditTime;
|
||||
/**
|
||||
* 流程阶段:
|
||||
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
|
||||
*/
|
||||
private Long flowStatus;
|
||||
/**
|
||||
* 总负责人ID
|
||||
*/
|
||||
private Long principalUserId;
|
||||
/**
|
||||
* 总负责人整合后的完整处理方案
|
||||
*/
|
||||
private String planContent;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 各部门投诉代办任务&意见对象 ts_complaint_task
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("ts_complaint_task")
|
||||
public class TsComplaintTask extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 代办任务ID
|
||||
*/
|
||||
@TableId(value = "task_id")
|
||||
private Long taskId;
|
||||
/**
|
||||
* 关联投诉受理单ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
/**
|
||||
* 负责部门ID(销售/质量/生产)
|
||||
*/
|
||||
private Long deptId;
|
||||
/**
|
||||
* 任务状态 0待填写意见 1已完成填写
|
||||
*/
|
||||
private Long taskStatus;
|
||||
/**
|
||||
* 意见单号
|
||||
*/
|
||||
private String fillNo;
|
||||
/**
|
||||
* 部门处理意见
|
||||
*/
|
||||
private String deptOpinion;
|
||||
/**
|
||||
* 填写意见的部门员工ID
|
||||
*/
|
||||
private Long fillUserId;
|
||||
/**
|
||||
* 意见填写时间
|
||||
*/
|
||||
private Date fillTime;
|
||||
/**
|
||||
* 意见文件
|
||||
*/
|
||||
private String fillFile;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.klp.flow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 最终方案下发部门及执行反馈对象 ts_plan_execute_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("ts_plan_execute_rel")
|
||||
public class TsPlanExecuteRel extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(value = "rel_id")
|
||||
private Long relId;
|
||||
/**
|
||||
* 关联最终方案ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
/**
|
||||
* 被下发执行的部门ID
|
||||
*/
|
||||
private Long deptId;
|
||||
/**
|
||||
* 执行状态 0待执行反馈 1已反馈完成
|
||||
*/
|
||||
private Long executeStatus;
|
||||
/**
|
||||
* 部门执行结果反馈
|
||||
*/
|
||||
private String executeResult;
|
||||
/**
|
||||
* 反馈单号
|
||||
*/
|
||||
private String feedbackNo;
|
||||
/**
|
||||
* 反馈人
|
||||
*/
|
||||
private Long feedbackUserId;
|
||||
/**
|
||||
* 反馈时间
|
||||
*/
|
||||
private Date feedbackTime;
|
||||
/**
|
||||
* 反馈文件
|
||||
*/
|
||||
private String feedbackFile;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标识 0=正常 2=删除
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 维修计划-异常记录关联业务对象 eqp_maintenance_plan_abnormal
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class EqpMaintenancePlanAbnormalBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 关联ID
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 巡检记录ID(eqp_equipment_inspection_record.record_id,run_status=2 异常记录)
|
||||
*/
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 维修计划主业务对象 eqp_maintenance_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class EqpMaintenancePlanBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
private String planNo;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 维修类型:1=定期保养 2=安全整改 3=专项检修 4=故障维修
|
||||
*/
|
||||
private Long repairType;
|
||||
|
||||
/**
|
||||
* 优先级:1=普通 2=重要
|
||||
*/
|
||||
private Long priorityLevel;
|
||||
|
||||
/**
|
||||
* 计划执行状态:1=待维修,2=维修中,3=已完成,4=已取消
|
||||
*/
|
||||
private Long planStatus;
|
||||
|
||||
/**
|
||||
* 审批状态:0=草稿 1=待审批 2=已审批 3=已驳回
|
||||
*/
|
||||
private Long approvalStatus;
|
||||
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
private Date plannedStartTime;
|
||||
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
private Date plannedEndTime;
|
||||
|
||||
/**
|
||||
* 负责部门
|
||||
*/
|
||||
private String dutyDept;
|
||||
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
private String planOwner;
|
||||
|
||||
/**
|
||||
* 预算金额(元)
|
||||
*/
|
||||
private BigDecimal budgetAmount;
|
||||
|
||||
/**
|
||||
* 计划说明
|
||||
*/
|
||||
private String planDescription;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
private Date actualCompleteTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 维修计划明细业务对象 eqp_maintenance_plan_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class EqpMaintenancePlanDetailBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
private Long detailId;
|
||||
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 巡检记录ID(来源异常工单)
|
||||
*/
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 设备ID(用户手动选择,关联 eqp_equipment_management.equipment_id)
|
||||
*/
|
||||
private Long equipmentId;
|
||||
|
||||
/**
|
||||
* 产线名称
|
||||
*/
|
||||
private String productionLine;
|
||||
|
||||
/**
|
||||
* 设备部件名称
|
||||
*/
|
||||
private String componentName;
|
||||
|
||||
/**
|
||||
* 单条维修项计划执行日期
|
||||
*/
|
||||
private Date itemPlanDate;
|
||||
|
||||
/**
|
||||
* 明细类型:0=保养 1=维修
|
||||
*/
|
||||
private Long maintenanceCategory;
|
||||
|
||||
/**
|
||||
* 明细完成状态:0=未开始 1=进行中 2=已完成
|
||||
*/
|
||||
private Long detailStatus;
|
||||
|
||||
/**
|
||||
* 维修内容描述
|
||||
*/
|
||||
private String repairContent;
|
||||
|
||||
/**
|
||||
* 维修负责人
|
||||
*/
|
||||
private String repairUser;
|
||||
|
||||
/**
|
||||
* 完成时间(打勾时记录)
|
||||
*/
|
||||
private Date completeTime;
|
||||
|
||||
/**
|
||||
* 实际支出金额(元)
|
||||
*/
|
||||
private BigDecimal actualCost;
|
||||
|
||||
/**
|
||||
* 完成进度百分比(0-100)
|
||||
*/
|
||||
private Long progressRate;
|
||||
|
||||
/**
|
||||
* 目标厂家
|
||||
*/
|
||||
private String targetManufacturer;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库差异记录业务对象 inv_count_discrepancy
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class InvCountDiscrepancyBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long discrepancyId;
|
||||
|
||||
/**
|
||||
* 盘库计划明细ID
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 差异类型:1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
|
||||
*/
|
||||
private Integer discrepancyType;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
private String enterCoilNo;
|
||||
|
||||
/**
|
||||
* 差异详情(JSON:含系统值、实盘值对比)
|
||||
*/
|
||||
private String discrepancyDetail;
|
||||
|
||||
/**
|
||||
* 原因分析
|
||||
*/
|
||||
private String reasonAnalysis;
|
||||
|
||||
/**
|
||||
* 处理建议
|
||||
*/
|
||||
private String processSuggestion;
|
||||
|
||||
/**
|
||||
* 处理结果
|
||||
*/
|
||||
private String processResult;
|
||||
|
||||
/**
|
||||
* 处理状态:0=待处理, 1=处理中, 2=已处理
|
||||
*/
|
||||
private Integer processStatus;
|
||||
|
||||
/**
|
||||
* 处理人ID
|
||||
*/
|
||||
private Long processUserId;
|
||||
|
||||
/**
|
||||
* 处理人姓名
|
||||
*/
|
||||
private String processUserName;
|
||||
|
||||
/**
|
||||
* 处理时间
|
||||
*/
|
||||
private Date processTime;
|
||||
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
private String attachFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库计划主业务对象 inv_count_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class InvCountPlanBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 盘库计划编号(如 PD-20260622-001)
|
||||
*/
|
||||
private String planCode;
|
||||
|
||||
/**
|
||||
* 盘库计划名称
|
||||
*/
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 盘库日期
|
||||
*/
|
||||
private Date countDate;
|
||||
|
||||
/**
|
||||
* 截止时间
|
||||
*/
|
||||
private Date deadlineTime;
|
||||
|
||||
/**
|
||||
* 盘点人ID
|
||||
*/
|
||||
private Long countUserId;
|
||||
|
||||
/**
|
||||
* 盘点人姓名
|
||||
*/
|
||||
private String countUserName;
|
||||
|
||||
/**
|
||||
* 负责人ID
|
||||
*/
|
||||
private Long principalUserId;
|
||||
|
||||
/**
|
||||
* 负责人姓名
|
||||
*/
|
||||
private String principalUserName;
|
||||
|
||||
/**
|
||||
* 参与人员ID列表(逗号分隔)
|
||||
*/
|
||||
private String participantIds;
|
||||
|
||||
/**
|
||||
* 参与人员姓名列表(逗号分隔)
|
||||
*/
|
||||
private String participantNames;
|
||||
|
||||
/**
|
||||
* 计划状态:0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
|
||||
*/
|
||||
private Integer planStatus;
|
||||
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
private String attachFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 盘库计划-库区关联业务对象 inv_count_plan_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class InvCountPlanWarehouseBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 盘库计划ID
|
||||
*/
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 逻辑库区ID
|
||||
*/
|
||||
private Long warehouseId;
|
||||
|
||||
/**
|
||||
* 逻辑库区名称(冗余)
|
||||
*/
|
||||
private String warehouseName;
|
||||
|
||||
/**
|
||||
* 实际库区ID
|
||||
*/
|
||||
private Long actualWarehouseId;
|
||||
|
||||
/**
|
||||
* 实际库区名称(冗余)
|
||||
*/
|
||||
private String actualWarehouseName;
|
||||
|
||||
/**
|
||||
* 系统钢卷数量
|
||||
*/
|
||||
private Long systemCoilCount;
|
||||
|
||||
/**
|
||||
* 系统总重量(kg)
|
||||
*/
|
||||
private BigDecimal systemTotalWeight;
|
||||
|
||||
/**
|
||||
* 实际盘点数量
|
||||
*/
|
||||
private Long actualCoilCount;
|
||||
|
||||
/**
|
||||
* 实际盘点总重量(kg)
|
||||
*/
|
||||
private BigDecimal actualTotalWeight;
|
||||
|
||||
/**
|
||||
* 是否账实一致(0=不一致, 1=一致, NULL=未盘点)
|
||||
*/
|
||||
private Integer isConsistent;
|
||||
|
||||
/**
|
||||
* 出入库记录查询起始时间
|
||||
*/
|
||||
private Date ioStartTime;
|
||||
|
||||
/**
|
||||
* 出入库记录查询截止时间
|
||||
*/
|
||||
private Date ioEndTime;
|
||||
|
||||
/**
|
||||
* 出入库记录快照(JSON)
|
||||
*/
|
||||
private String snapshotIoRecord;
|
||||
|
||||
/**
|
||||
* 逻辑库区钢卷明细快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilLogic;
|
||||
|
||||
/**
|
||||
* 实际库区钢卷明细快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilActual;
|
||||
|
||||
/**
|
||||
* 钢卷数量统计快照(JSON)
|
||||
*/
|
||||
private String snapshotCoilStats;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 排产单主业务对象 sch_prod_schedule
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SchProdScheduleBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 排产单主键ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 排产单号(唯一标识,钢卷关联依据)
|
||||
*/
|
||||
private String scheduleNo;
|
||||
|
||||
/**
|
||||
* 生产日期(和合同号组成业务关联键)
|
||||
*/
|
||||
private Date prodDate;
|
||||
|
||||
/**
|
||||
* 排产状态:0草稿 1待审核 2已下达 3已退回
|
||||
*/
|
||||
private Long scheduleStatus;
|
||||
|
||||
/**
|
||||
* 排产总计划吨数
|
||||
*/
|
||||
private BigDecimal totalPlanWeight;
|
||||
|
||||
/**
|
||||
* 关联销售合同号
|
||||
*/
|
||||
private String relContractNo;
|
||||
|
||||
/**
|
||||
* 业务员
|
||||
*/
|
||||
private String businessUser;
|
||||
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
private String businessPhone;
|
||||
|
||||
/**
|
||||
* 订单日期
|
||||
*/
|
||||
private Date orderDate;
|
||||
|
||||
/**
|
||||
* 订货单位
|
||||
*/
|
||||
private String customerName;
|
||||
|
||||
/**
|
||||
* 交货期(天)
|
||||
*/
|
||||
private Long deliveryCycle;
|
||||
|
||||
/**
|
||||
* 产品用途
|
||||
*/
|
||||
private String usePurpose;
|
||||
|
||||
/**
|
||||
* 品名:冷硬钢卷/镀锌钢卷/冷轧钢卷/镀铬钢卷
|
||||
*/
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 厚度公差
|
||||
*/
|
||||
private String thicknessTolerance;
|
||||
|
||||
/**
|
||||
* 宽度公差
|
||||
*/
|
||||
private String widthTolerance;
|
||||
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
private String surfaceQuality;
|
||||
|
||||
/**
|
||||
* 表面处理
|
||||
*/
|
||||
private String surfaceTreatment;
|
||||
|
||||
/**
|
||||
* 内径尺寸
|
||||
*/
|
||||
private String innerDiameter;
|
||||
|
||||
/**
|
||||
* 外径要求
|
||||
*/
|
||||
private String outerDiameter;
|
||||
|
||||
/**
|
||||
* 包装要求
|
||||
*/
|
||||
private String packReq;
|
||||
|
||||
/**
|
||||
* 切边要求
|
||||
*/
|
||||
private String cutEdgeReq;
|
||||
|
||||
/**
|
||||
* 单件重量
|
||||
*/
|
||||
private String singleCoilWeight;
|
||||
|
||||
/**
|
||||
* 交货重量偏差
|
||||
*/
|
||||
private String weightDeviation;
|
||||
|
||||
/**
|
||||
* 其他技术要求
|
||||
*/
|
||||
private String otherTechReq;
|
||||
|
||||
/**
|
||||
* 付款情况说明
|
||||
*/
|
||||
private String paymentDesc;
|
||||
|
||||
/**
|
||||
* 退回原因
|
||||
*/
|
||||
private String returnReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 排产单明细业务对象 sch_prod_schedule_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SchProdScheduleDetailBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 排产明细ID
|
||||
*/
|
||||
private Long scheduleDetailId;
|
||||
|
||||
/**
|
||||
* 排产单主表ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 来源销售订单明细ID(溯源原始订单规格)
|
||||
*/
|
||||
private Long orderDetailId;
|
||||
|
||||
/**
|
||||
* 规格 例:1.0X1250
|
||||
*/
|
||||
private String spec;
|
||||
|
||||
/**
|
||||
* 材质 DX51D
|
||||
*/
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 本次排产吨数(数量),可审核修改
|
||||
*/
|
||||
private BigDecimal scheduleWeight;
|
||||
|
||||
/**
|
||||
* 品名
|
||||
*/
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 单行排产备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 销售订单-排产单多对多关联业务对象 sch_sale_schedule_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SchSaleScheduleRelBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 关联主键ID
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 销售订单ID
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 排产单ID
|
||||
*/
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 本次排产占用该订单重量
|
||||
*/
|
||||
private BigDecimal relWeight;
|
||||
|
||||
/**
|
||||
* 关联备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 受理单关联钢卷中间业务对象 ts_accept_coil_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class TsAcceptCoilRelBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 投诉受理单ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 投诉受理单主业务对象 ts_complaint_accept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class TsComplaintAcceptBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 受理单主键
|
||||
*/
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 投诉编号 TS-2026-001
|
||||
*/
|
||||
private String complaintNo;
|
||||
|
||||
/**
|
||||
* 投诉日期
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date complaintDate;
|
||||
|
||||
/**
|
||||
* 投诉情况描述
|
||||
*/
|
||||
private String complaintContent;
|
||||
|
||||
/**
|
||||
* 客户诉求
|
||||
*/
|
||||
private String customerDemand;
|
||||
|
||||
/**
|
||||
* 客户照片凭证等
|
||||
*/
|
||||
private String file;
|
||||
|
||||
/**
|
||||
* 审核状态 0待审核 1已通过 2未通过
|
||||
*/
|
||||
private Long auditStatus;
|
||||
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
private String auditOpinion;
|
||||
|
||||
/**
|
||||
* 审核人ID
|
||||
*/
|
||||
private Long auditUserId;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 流程阶段:
|
||||
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
|
||||
*/
|
||||
private Long flowStatus;
|
||||
|
||||
/**
|
||||
* 总负责人ID
|
||||
*/
|
||||
private Long principalUserId;
|
||||
|
||||
/**
|
||||
* 总负责人整合后的完整处理方案
|
||||
*/
|
||||
private String planContent;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 关联的钢卷ID列表(新增受理单时一并插入到ts_accept_coil_rel)
|
||||
*/
|
||||
private List<Long> coilIds;
|
||||
|
||||
/**
|
||||
* 受理单ID列表(批量查询用)
|
||||
*/
|
||||
private List<Long> acceptIds;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 各部门投诉代办任务&意见业务对象 ts_complaint_task
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class TsComplaintTaskBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 代办任务ID
|
||||
*/
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 关联投诉受理单ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 负责部门ID(销售/质量/生产)
|
||||
*/
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 任务状态 0待填写意见 1已完成填写
|
||||
*/
|
||||
private Long taskStatus;
|
||||
|
||||
/**
|
||||
* 意见单号
|
||||
*/
|
||||
private String fillNo;
|
||||
|
||||
/**
|
||||
* 部门处理意见
|
||||
*/
|
||||
private String deptOpinion;
|
||||
|
||||
/**
|
||||
* 填写意见的部门员工ID
|
||||
*/
|
||||
private Long fillUserId;
|
||||
|
||||
/**
|
||||
* 意见填写时间
|
||||
*/
|
||||
private Date fillTime;
|
||||
|
||||
/**
|
||||
* 意见文件
|
||||
*/
|
||||
private String fillFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.klp.flow.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 最终方案下发部门及执行反馈业务对象 ts_plan_execute_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class TsPlanExecuteRelBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 关联最终方案ID
|
||||
*/
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 被下发执行的部门ID
|
||||
*/
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 执行状态 0待执行反馈 1已反馈完成
|
||||
*/
|
||||
private Long executeStatus;
|
||||
|
||||
/**
|
||||
* 部门执行结果反馈
|
||||
*/
|
||||
private String executeResult;
|
||||
|
||||
/**
|
||||
* 反馈单号
|
||||
*/
|
||||
private String feedbackNo;
|
||||
|
||||
/**
|
||||
* 反馈人
|
||||
*/
|
||||
private Long feedbackUserId;
|
||||
|
||||
/**
|
||||
* 反馈时间
|
||||
*/
|
||||
private Date feedbackTime;
|
||||
|
||||
/**
|
||||
* 反馈文件
|
||||
*/
|
||||
private String feedbackFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 维修计划-异常记录关联视图对象 eqp_maintenance_plan_abnormal
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class EqpMaintenancePlanAbnormalVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 关联ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联ID")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
@ExcelProperty(value = "维修计划ID")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 巡检记录ID(eqp_equipment_inspection_record.record_id,run_status=2 异常记录)
|
||||
*/
|
||||
@ExcelProperty(value = "巡检记录ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "e=qp_equipment_inspection_record.record_id,run_status=2,异=常记录")
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 维修计划明细视图对象 eqp_maintenance_plan_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class EqpMaintenancePlanDetailVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
@ExcelProperty(value = "明细ID")
|
||||
private Long detailId;
|
||||
|
||||
/**
|
||||
* 维修计划ID
|
||||
*/
|
||||
@ExcelProperty(value = "维修计划ID")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 巡检记录ID(来源异常工单)
|
||||
*/
|
||||
@ExcelProperty(value = "巡检记录ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "来=源异常工单")
|
||||
private Long recordId;
|
||||
|
||||
/**
|
||||
* 设备ID(用户手动选择,关联 eqp_equipment_management.equipment_id)
|
||||
*/
|
||||
@ExcelProperty(value = "设备ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "用=户手动选择,关联,e=qp_equipment_management.equipment_id")
|
||||
private Long equipmentId;
|
||||
|
||||
/**
|
||||
* 产线名称
|
||||
*/
|
||||
@ExcelProperty(value = "产线名称")
|
||||
private String productionLine;
|
||||
|
||||
/**
|
||||
* 设备部件名称
|
||||
*/
|
||||
@ExcelProperty(value = "设备部件名称")
|
||||
private String componentName;
|
||||
|
||||
/**
|
||||
* 单条维修项计划执行日期
|
||||
*/
|
||||
@ExcelProperty(value = "单条维修项计划执行日期")
|
||||
private Date itemPlanDate;
|
||||
|
||||
/**
|
||||
* 明细类型:0=保养 1=维修
|
||||
*/
|
||||
@ExcelProperty(value = "明细类型:0=保养 1=维修")
|
||||
private Long maintenanceCategory;
|
||||
|
||||
/**
|
||||
* 明细完成状态:0=未开始 1=进行中 2=已完成
|
||||
*/
|
||||
@ExcelProperty(value = "明细完成状态:0=未开始 1=进行中 2=已完成")
|
||||
private Long detailStatus;
|
||||
|
||||
/**
|
||||
* 维修内容描述
|
||||
*/
|
||||
@ExcelProperty(value = "维修内容描述")
|
||||
private String repairContent;
|
||||
|
||||
/**
|
||||
* 维修负责人
|
||||
*/
|
||||
@ExcelProperty(value = "维修负责人")
|
||||
private String repairUser;
|
||||
|
||||
/**
|
||||
* 完成时间(打勾时记录)
|
||||
*/
|
||||
@ExcelProperty(value = "完成时间", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "打=勾时记录")
|
||||
private Date completeTime;
|
||||
|
||||
/**
|
||||
* 实际支出金额(元)
|
||||
*/
|
||||
@ExcelProperty(value = "实际支出金额(元)")
|
||||
private BigDecimal actualCost;
|
||||
|
||||
/**
|
||||
* 完成进度百分比(0-100)
|
||||
*/
|
||||
@ExcelProperty(value = "完成进度百分比(0-100)")
|
||||
private Long progressRate;
|
||||
|
||||
/**
|
||||
* 目标厂家
|
||||
*/
|
||||
@ExcelProperty(value = "目标厂家")
|
||||
private String targetManufacturer;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 维修计划主视图对象 eqp_maintenance_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class EqpMaintenancePlanVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 计划ID
|
||||
*/
|
||||
@ExcelProperty(value = "计划ID")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
@ExcelProperty(value = "计划编号")
|
||||
private String planNo;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
@ExcelProperty(value = "计划名称")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 维修类型:1=定期保养 2=安全整改 3=专项检修 4=故障维修
|
||||
*/
|
||||
@ExcelProperty(value = "维修类型:1=定期保养 2=安全整改 3=专项检修 4=故障维修")
|
||||
private Long repairType;
|
||||
|
||||
/**
|
||||
* 优先级:1=普通 2=重要
|
||||
*/
|
||||
@ExcelProperty(value = "优先级:1=普通 2=重要")
|
||||
private Long priorityLevel;
|
||||
|
||||
/**
|
||||
* 计划执行状态:1=待维修,2=维修中,3=已完成,4=已取消
|
||||
*/
|
||||
@ExcelProperty(value = "计划执行状态:1=待维修,2=维修中,3=已完成,4=已取消")
|
||||
private Long planStatus;
|
||||
|
||||
/**
|
||||
* 审批状态:0=草稿 1=待审批 2=已审批 3=已驳回
|
||||
*/
|
||||
@ExcelProperty(value = "审批状态:0=草稿 1=待审批 2=已审批 3=已驳回")
|
||||
private Long approvalStatus;
|
||||
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
@ExcelProperty(value = "计划开始时间")
|
||||
private Date plannedStartTime;
|
||||
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
@ExcelProperty(value = "计划结束时间")
|
||||
private Date plannedEndTime;
|
||||
|
||||
/**
|
||||
* 负责部门
|
||||
*/
|
||||
@ExcelProperty(value = "负责部门")
|
||||
private String dutyDept;
|
||||
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
@ExcelProperty(value = "计划负责人")
|
||||
private String planOwner;
|
||||
|
||||
/**
|
||||
* 预算金额(元)
|
||||
*/
|
||||
@ExcelProperty(value = "预算金额(元)")
|
||||
private BigDecimal budgetAmount;
|
||||
|
||||
/**
|
||||
* 计划说明
|
||||
*/
|
||||
@ExcelProperty(value = "计划说明")
|
||||
private String planDescription;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
@ExcelProperty(value = "实际完成时间")
|
||||
private Date actualCompleteTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 盘库差异记录视图对象 inv_count_discrepancy
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class InvCountDiscrepancyVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long discrepancyId;
|
||||
|
||||
/**
|
||||
* 盘库计划明细ID
|
||||
*/
|
||||
@ExcelProperty(value = "盘库计划明细ID")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 差异类型:1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差
|
||||
*/
|
||||
@ExcelProperty(value = "差异类型:1=盘盈, 2=盘亏, 3=状态不符, 4=重量偏差")
|
||||
private Integer discrepancyType;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷ID")
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷号")
|
||||
private String enterCoilNo;
|
||||
|
||||
/**
|
||||
* 差异详情(JSON:含系统值、实盘值对比)
|
||||
*/
|
||||
@ExcelProperty(value = "差异详情", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "J=SON:含系统值、实盘值对比")
|
||||
private String discrepancyDetail;
|
||||
|
||||
/**
|
||||
* 原因分析
|
||||
*/
|
||||
@ExcelProperty(value = "原因分析")
|
||||
private String reasonAnalysis;
|
||||
|
||||
/**
|
||||
* 处理建议
|
||||
*/
|
||||
@ExcelProperty(value = "处理建议")
|
||||
private String processSuggestion;
|
||||
|
||||
/**
|
||||
* 处理结果
|
||||
*/
|
||||
@ExcelProperty(value = "处理结果")
|
||||
private String processResult;
|
||||
|
||||
/**
|
||||
* 处理状态:0=待处理, 1=处理中, 2=已处理
|
||||
*/
|
||||
@ExcelProperty(value = "处理状态:0=待处理, 1=处理中, 2=已处理")
|
||||
private Integer processStatus;
|
||||
|
||||
/**
|
||||
* 处理人ID
|
||||
*/
|
||||
@ExcelProperty(value = "处理人ID")
|
||||
private Long processUserId;
|
||||
|
||||
/**
|
||||
* 处理人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "处理人姓名")
|
||||
private String processUserName;
|
||||
|
||||
/**
|
||||
* 处理时间
|
||||
*/
|
||||
@ExcelProperty(value = "处理时间")
|
||||
private Date processTime;
|
||||
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
@ExcelProperty(value = "附件文件名称集合,多文件逗号分隔,前端展示")
|
||||
private String attachFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 盘库计划主视图对象 inv_count_plan
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class InvCountPlanVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 盘库计划编号(如 PD-20260622-001)
|
||||
*/
|
||||
@ExcelProperty(value = "盘库计划编号", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "如=,P=D-20260622-001")
|
||||
private String planCode;
|
||||
|
||||
/**
|
||||
* 盘库计划名称
|
||||
*/
|
||||
@ExcelProperty(value = "盘库计划名称")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 盘库日期
|
||||
*/
|
||||
@ExcelProperty(value = "盘库日期")
|
||||
private Date countDate;
|
||||
|
||||
/**
|
||||
* 截止时间
|
||||
*/
|
||||
@ExcelProperty(value = "截止时间")
|
||||
private Date deadlineTime;
|
||||
|
||||
/**
|
||||
* 盘点人ID
|
||||
*/
|
||||
@ExcelProperty(value = "盘点人ID")
|
||||
private Long countUserId;
|
||||
|
||||
/**
|
||||
* 盘点人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "盘点人姓名")
|
||||
private String countUserName;
|
||||
|
||||
/**
|
||||
* 负责人ID
|
||||
*/
|
||||
@ExcelProperty(value = "负责人ID")
|
||||
private Long principalUserId;
|
||||
|
||||
/**
|
||||
* 负责人姓名
|
||||
*/
|
||||
@ExcelProperty(value = "负责人姓名")
|
||||
private String principalUserName;
|
||||
|
||||
/**
|
||||
* 参与人员ID列表(逗号分隔)
|
||||
*/
|
||||
@ExcelProperty(value = "参与人员ID列表", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "逗=号分隔")
|
||||
private String participantIds;
|
||||
|
||||
/**
|
||||
* 参与人员姓名列表(逗号分隔)
|
||||
*/
|
||||
@ExcelProperty(value = "参与人员姓名列表", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "逗=号分隔")
|
||||
private String participantNames;
|
||||
|
||||
/**
|
||||
* 计划状态:0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档
|
||||
*/
|
||||
@ExcelProperty(value = "计划状态:0=草稿, 1=待审批, 2=执行中, 3=差异处理中, 4=已归档")
|
||||
private Integer planStatus;
|
||||
|
||||
/**
|
||||
* 附件文件名称集合,多文件逗号分隔,前端展示
|
||||
*/
|
||||
@ExcelProperty(value = "附件文件名称集合,多文件逗号分隔,前端展示")
|
||||
private String attachFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 盘库计划-库区关联视图对象 inv_count_plan_warehouse
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class InvCountPlanWarehouseVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 盘库计划ID
|
||||
*/
|
||||
@ExcelProperty(value = "盘库计划ID")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 逻辑库区ID
|
||||
*/
|
||||
@ExcelProperty(value = "逻辑库区ID")
|
||||
private Long warehouseId;
|
||||
|
||||
/**
|
||||
* 逻辑库区名称(冗余)
|
||||
*/
|
||||
@ExcelProperty(value = "逻辑库区名称", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "冗=余")
|
||||
private String warehouseName;
|
||||
|
||||
/**
|
||||
* 实际库区ID
|
||||
*/
|
||||
@ExcelProperty(value = "实际库区ID")
|
||||
private Long actualWarehouseId;
|
||||
|
||||
/**
|
||||
* 实际库区名称(冗余)
|
||||
*/
|
||||
@ExcelProperty(value = "实际库区名称", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "冗=余")
|
||||
private String actualWarehouseName;
|
||||
|
||||
/**
|
||||
* 系统钢卷数量
|
||||
*/
|
||||
@ExcelProperty(value = "系统钢卷数量")
|
||||
private Long systemCoilCount;
|
||||
|
||||
/**
|
||||
* 系统总重量(kg)
|
||||
*/
|
||||
@ExcelProperty(value = "系统总重量(kg)")
|
||||
private BigDecimal systemTotalWeight;
|
||||
|
||||
/**
|
||||
* 实际盘点数量
|
||||
*/
|
||||
@ExcelProperty(value = "实际盘点数量")
|
||||
private Long actualCoilCount;
|
||||
|
||||
/**
|
||||
* 实际盘点总重量(kg)
|
||||
*/
|
||||
@ExcelProperty(value = "实际盘点总重量(kg)")
|
||||
private BigDecimal actualTotalWeight;
|
||||
|
||||
/**
|
||||
* 是否账实一致(0=不一致, 1=一致, NULL=未盘点)
|
||||
*/
|
||||
@ExcelProperty(value = "是否账实一致", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "0==不一致,,1==一致,,N=ULL=未盘点")
|
||||
private Integer isConsistent;
|
||||
|
||||
/**
|
||||
* 出入库记录查询起始时间
|
||||
*/
|
||||
@ExcelProperty(value = "出入库记录查询起始时间")
|
||||
private Date ioStartTime;
|
||||
|
||||
/**
|
||||
* 出入库记录查询截止时间
|
||||
*/
|
||||
@ExcelProperty(value = "出入库记录查询截止时间")
|
||||
private Date ioEndTime;
|
||||
|
||||
/**
|
||||
* 出入库记录快照(JSON)
|
||||
*/
|
||||
@ExcelProperty(value = "出入库记录快照", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "J=SON")
|
||||
private String snapshotIoRecord;
|
||||
|
||||
/**
|
||||
* 逻辑库区钢卷明细快照(JSON)
|
||||
*/
|
||||
@ExcelProperty(value = "逻辑库区钢卷明细快照", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "J=SON")
|
||||
private String snapshotCoilLogic;
|
||||
|
||||
/**
|
||||
* 实际库区钢卷明细快照(JSON)
|
||||
*/
|
||||
@ExcelProperty(value = "实际库区钢卷明细快照", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "J=SON")
|
||||
private String snapshotCoilActual;
|
||||
|
||||
/**
|
||||
* 钢卷数量统计快照(JSON)
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷数量统计快照", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "J=SON")
|
||||
private String snapshotCoilStats;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 排产单明细视图对象 sch_prod_schedule_detail
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class SchProdScheduleDetailVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 排产明细ID
|
||||
*/
|
||||
@ExcelProperty(value = "排产明细ID")
|
||||
private Long scheduleDetailId;
|
||||
|
||||
/**
|
||||
* 排产单主表ID
|
||||
*/
|
||||
@ExcelProperty(value = "排产单主表ID")
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 来源销售订单明细ID(溯源原始订单规格)
|
||||
*/
|
||||
@ExcelProperty(value = "来源销售订单明细ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "溯=源原始订单规格")
|
||||
private Long orderDetailId;
|
||||
|
||||
/**
|
||||
* 规格 例:1.0X1250
|
||||
*/
|
||||
@ExcelProperty(value = "规格 例:1.0X1250")
|
||||
private String spec;
|
||||
|
||||
/**
|
||||
* 材质 DX51D
|
||||
*/
|
||||
@ExcelProperty(value = "材质 DX51D")
|
||||
private String material;
|
||||
|
||||
/**
|
||||
* 本次排产吨数(数量),可审核修改
|
||||
*/
|
||||
@ExcelProperty(value = "本次排产吨数(数量),可审核修改")
|
||||
private BigDecimal scheduleWeight;
|
||||
|
||||
/**
|
||||
* 品名
|
||||
*/
|
||||
@ExcelProperty(value = "品名")
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 单行排产备注
|
||||
*/
|
||||
@ExcelProperty(value = "单行排产备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,190 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 排产单主视图对象 sch_prod_schedule
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class SchProdScheduleVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 排产单主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "排产单主键ID")
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 排产单号(唯一标识,钢卷关联依据)
|
||||
*/
|
||||
@ExcelProperty(value = "排产单号", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "唯=一标识,钢卷关联依据")
|
||||
private String scheduleNo;
|
||||
|
||||
/**
|
||||
* 生产日期(和合同号组成业务关联键)
|
||||
*/
|
||||
@ExcelProperty(value = "生产日期", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "和=合同号组成业务关联键")
|
||||
private Date prodDate;
|
||||
|
||||
/**
|
||||
* 排产状态:0草稿 1待审核 2已下达 3已退回
|
||||
*/
|
||||
@ExcelProperty(value = "排产状态:0草稿 1待审核 2已下达 3已退回")
|
||||
private Long scheduleStatus;
|
||||
|
||||
/**
|
||||
* 排产总计划吨数
|
||||
*/
|
||||
@ExcelProperty(value = "排产总计划吨数")
|
||||
private BigDecimal totalPlanWeight;
|
||||
|
||||
/**
|
||||
* 关联销售合同号
|
||||
*/
|
||||
@ExcelProperty(value = "关联销售合同号")
|
||||
private String relContractNo;
|
||||
|
||||
/**
|
||||
* 业务员
|
||||
*/
|
||||
@ExcelProperty(value = "业务员")
|
||||
private String businessUser;
|
||||
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@ExcelProperty(value = "联系电话")
|
||||
private String businessPhone;
|
||||
|
||||
/**
|
||||
* 订单日期
|
||||
*/
|
||||
@ExcelProperty(value = "订单日期")
|
||||
private Date orderDate;
|
||||
|
||||
/**
|
||||
* 订货单位
|
||||
*/
|
||||
@ExcelProperty(value = "订货单位")
|
||||
private String customerName;
|
||||
|
||||
/**
|
||||
* 交货期(天)
|
||||
*/
|
||||
@ExcelProperty(value = "交货期(天)")
|
||||
private Long deliveryCycle;
|
||||
|
||||
/**
|
||||
* 产品用途
|
||||
*/
|
||||
@ExcelProperty(value = "产品用途")
|
||||
private String usePurpose;
|
||||
|
||||
/**
|
||||
* 品名:冷硬钢卷/镀锌钢卷/冷轧钢卷/镀铬钢卷
|
||||
*/
|
||||
@ExcelProperty(value = "品名:冷硬钢卷/镀锌钢卷/冷轧钢卷/镀铬钢卷")
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 厚度公差
|
||||
*/
|
||||
@ExcelProperty(value = "厚度公差")
|
||||
private String thicknessTolerance;
|
||||
|
||||
/**
|
||||
* 宽度公差
|
||||
*/
|
||||
@ExcelProperty(value = "宽度公差")
|
||||
private String widthTolerance;
|
||||
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
@ExcelProperty(value = "表面质量")
|
||||
private String surfaceQuality;
|
||||
|
||||
/**
|
||||
* 表面处理
|
||||
*/
|
||||
@ExcelProperty(value = "表面处理")
|
||||
private String surfaceTreatment;
|
||||
|
||||
/**
|
||||
* 内径尺寸
|
||||
*/
|
||||
@ExcelProperty(value = "内径尺寸")
|
||||
private String innerDiameter;
|
||||
|
||||
/**
|
||||
* 外径要求
|
||||
*/
|
||||
@ExcelProperty(value = "外径要求")
|
||||
private String outerDiameter;
|
||||
|
||||
/**
|
||||
* 包装要求
|
||||
*/
|
||||
@ExcelProperty(value = "包装要求")
|
||||
private String packReq;
|
||||
|
||||
/**
|
||||
* 切边要求
|
||||
*/
|
||||
@ExcelProperty(value = "切边要求")
|
||||
private String cutEdgeReq;
|
||||
|
||||
/**
|
||||
* 单件重量
|
||||
*/
|
||||
@ExcelProperty(value = "单件重量")
|
||||
private String singleCoilWeight;
|
||||
|
||||
/**
|
||||
* 交货重量偏差
|
||||
*/
|
||||
@ExcelProperty(value = "交货重量偏差")
|
||||
private String weightDeviation;
|
||||
|
||||
/**
|
||||
* 其他技术要求
|
||||
*/
|
||||
@ExcelProperty(value = "其他技术要求")
|
||||
private String otherTechReq;
|
||||
|
||||
/**
|
||||
* 付款情况说明
|
||||
*/
|
||||
@ExcelProperty(value = "付款情况说明")
|
||||
private String paymentDesc;
|
||||
|
||||
/**
|
||||
* 退回原因
|
||||
*/
|
||||
@ExcelProperty(value = "退回原因")
|
||||
private String returnReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 销售订单-排产单多对多关联视图对象 sch_sale_schedule_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class SchSaleScheduleRelVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 关联主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联主键ID")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 销售订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "销售订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 排产单ID
|
||||
*/
|
||||
@ExcelProperty(value = "排产单ID")
|
||||
private Long scheduleId;
|
||||
|
||||
/**
|
||||
* 本次排产占用该订单重量
|
||||
*/
|
||||
@ExcelProperty(value = "本次排产占用该订单重量")
|
||||
private BigDecimal relWeight;
|
||||
|
||||
/**
|
||||
* 关联备注
|
||||
*/
|
||||
@ExcelProperty(value = "关联备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.domain.vo.WmsMaterialCoilVo;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 受理单关联钢卷中间视图对象 ts_accept_coil_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class TsAcceptCoilRelVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ExcelProperty(value = "")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 投诉受理单ID
|
||||
*/
|
||||
@ExcelProperty(value = "投诉受理单ID")
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷ID")
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 关联的钢卷信息(丰富返回值)
|
||||
*/
|
||||
private WmsMaterialCoilVo coilInfo;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 投诉受理单主视图对象 ts_complaint_accept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class TsComplaintAcceptVo extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 受理单主键
|
||||
*/
|
||||
@ExcelProperty(value = "受理单主键")
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 投诉编号 TS-2026-001
|
||||
*/
|
||||
@ExcelProperty(value = "投诉编号 TS-2026-001")
|
||||
private String complaintNo;
|
||||
|
||||
/**
|
||||
* 投诉日期
|
||||
*/
|
||||
@ExcelProperty(value = "投诉日期")
|
||||
private Date complaintDate;
|
||||
|
||||
/**
|
||||
* 投诉情况描述
|
||||
*/
|
||||
@ExcelProperty(value = "投诉情况描述")
|
||||
private String complaintContent;
|
||||
|
||||
/**
|
||||
* 客户诉求
|
||||
*/
|
||||
@ExcelProperty(value = "客户诉求")
|
||||
private String customerDemand;
|
||||
|
||||
/**
|
||||
* 客户照片凭证等
|
||||
*/
|
||||
@ExcelProperty(value = "客户照片凭证等")
|
||||
private String file;
|
||||
|
||||
/**
|
||||
* 审核状态 0待审核 1已通过 2未通过
|
||||
*/
|
||||
@ExcelProperty(value = "审核状态 0待审核 1已通过 2未通过")
|
||||
private Long auditStatus;
|
||||
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
@ExcelProperty(value = "审核意见")
|
||||
private String auditOpinion;
|
||||
|
||||
/**
|
||||
* 审核人ID
|
||||
*/
|
||||
@ExcelProperty(value = "审核人ID")
|
||||
private Long auditUserId;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
@ExcelProperty(value = "审核时间")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 流程阶段:
|
||||
1=待审核 2=部门意见填写中 3=待总负责人汇总方案 4=方案下发执行反馈中 5=全部办结
|
||||
*/
|
||||
@ExcelProperty(value = "流程阶段")
|
||||
private Long flowStatus;
|
||||
|
||||
/**
|
||||
* 总负责人ID
|
||||
*/
|
||||
@ExcelProperty(value = "总负责人ID")
|
||||
private Long principalUserId;
|
||||
|
||||
/**
|
||||
* 总负责人整合后的完整处理方案
|
||||
*/
|
||||
@ExcelProperty(value = "总负责人整合后的完整处理方案")
|
||||
private String planContent;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 各部门投诉代办任务&意见视图对象 ts_complaint_task
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class TsComplaintTaskVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 代办任务ID
|
||||
*/
|
||||
@ExcelProperty(value = "代办任务ID")
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 关联投诉受理单ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联投诉受理单ID")
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 负责部门ID(销售/质量/生产)
|
||||
*/
|
||||
@ExcelProperty(value = "负责部门ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "销=售/质量/生产")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 任务状态 0待填写意见 1已完成填写
|
||||
*/
|
||||
@ExcelProperty(value = "任务状态 0待填写意见 1已完成填写")
|
||||
private Long taskStatus;
|
||||
|
||||
/**
|
||||
* 意见单号
|
||||
*/
|
||||
@ExcelProperty(value = "意见单号")
|
||||
private String fillNo;
|
||||
|
||||
/**
|
||||
* 部门处理意见
|
||||
*/
|
||||
@ExcelProperty(value = "部门处理意见")
|
||||
private String deptOpinion;
|
||||
|
||||
/**
|
||||
* 填写意见的部门员工ID
|
||||
*/
|
||||
@ExcelProperty(value = "填写意见的部门员工ID")
|
||||
private Long fillUserId;
|
||||
|
||||
/**
|
||||
* 意见填写时间
|
||||
*/
|
||||
@ExcelProperty(value = "意见填写时间")
|
||||
private Date fillTime;
|
||||
|
||||
/**
|
||||
* 意见文件
|
||||
*/
|
||||
@ExcelProperty(value = "意见文件")
|
||||
private String fillFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 关联的受理单信息
|
||||
*/
|
||||
private TsComplaintAcceptVo acceptInfo;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package com.klp.flow.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 最终方案下发部门及执行反馈视图对象 ts_plan_execute_rel
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class TsPlanExecuteRelVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ExcelProperty(value = "")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 关联最终方案ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联最终方案ID")
|
||||
private Long acceptId;
|
||||
|
||||
/**
|
||||
* 被下发执行的部门ID
|
||||
*/
|
||||
@ExcelProperty(value = "被下发执行的部门ID")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 执行状态 0待执行反馈 1已反馈完成
|
||||
*/
|
||||
@ExcelProperty(value = "执行状态 0待执行反馈 1已反馈完成")
|
||||
private Long executeStatus;
|
||||
|
||||
/**
|
||||
* 部门执行结果反馈
|
||||
*/
|
||||
@ExcelProperty(value = "部门执行结果反馈")
|
||||
private String executeResult;
|
||||
|
||||
/**
|
||||
* 反馈单号
|
||||
*/
|
||||
@ExcelProperty(value = "反馈单号")
|
||||
private String feedbackNo;
|
||||
|
||||
/**
|
||||
* 反馈人
|
||||
*/
|
||||
@ExcelProperty(value = "反馈人")
|
||||
private Long feedbackUserId;
|
||||
|
||||
/**
|
||||
* 反馈时间
|
||||
*/
|
||||
@ExcelProperty(value = "反馈时间")
|
||||
private Date feedbackTime;
|
||||
|
||||
/**
|
||||
* 反馈文件
|
||||
*/
|
||||
@ExcelProperty(value = "反馈文件")
|
||||
private String feedbackFile;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
// 受理单
|
||||
private TsComplaintAcceptVo acceptInfo;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.EqpMaintenancePlanAbnormal;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanAbnormalVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 维修计划-异常记录关联Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
public interface EqpMaintenancePlanAbnormalMapper extends BaseMapperPlus<EqpMaintenancePlanAbnormalMapper, EqpMaintenancePlanAbnormal, EqpMaintenancePlanAbnormalVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.EqpMaintenancePlanDetail;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanDetailVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 维修计划明细Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
public interface EqpMaintenancePlanDetailMapper extends BaseMapperPlus<EqpMaintenancePlanDetailMapper, EqpMaintenancePlanDetail, EqpMaintenancePlanDetailVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.EqpMaintenancePlan;
|
||||
import com.klp.flow.domain.vo.EqpMaintenancePlanVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 维修计划主Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
public interface EqpMaintenancePlanMapper extends BaseMapperPlus<EqpMaintenancePlanMapper, EqpMaintenancePlan, EqpMaintenancePlanVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.InvCountDiscrepancy;
|
||||
import com.klp.flow.domain.vo.InvCountDiscrepancyVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 盘库差异记录Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
public interface InvCountDiscrepancyMapper extends BaseMapperPlus<InvCountDiscrepancyMapper, InvCountDiscrepancy, InvCountDiscrepancyVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.InvCountPlan;
|
||||
import com.klp.flow.domain.vo.InvCountPlanVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 盘库计划主Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
public interface InvCountPlanMapper extends BaseMapperPlus<InvCountPlanMapper, InvCountPlan, InvCountPlanVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.InvCountPlanWarehouse;
|
||||
import com.klp.flow.domain.vo.InvCountPlanWarehouseVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 盘库计划-库区关联Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-22
|
||||
*/
|
||||
public interface InvCountPlanWarehouseMapper extends BaseMapperPlus<InvCountPlanWarehouseMapper, InvCountPlanWarehouse, InvCountPlanWarehouseVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.flow.mapper;
|
||||
|
||||
import com.klp.flow.domain.SchProdScheduleDetail;
|
||||
import com.klp.flow.domain.vo.SchProdScheduleDetailVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 排产单明细Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-23
|
||||
*/
|
||||
public interface SchProdScheduleDetailMapper extends BaseMapperPlus<SchProdScheduleDetailMapper, SchProdScheduleDetail, SchProdScheduleDetailVo> {
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user