From 88389b278165806313d1f382da205caabbfe698a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 11 May 2026 11:51:56 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat(CoilSelector):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E9=80=89=E6=8B=A9=E5=99=A8=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构钢卷选择器组件布局，改进多选模式下的用户体验。主要变更包括： 1. 调整列顺序和显示内容，优化表格布局 2. 添加全选当前页和清除全部功能按钮 3. 修复对话框滚动问题，优化样式 4. 完善已选钢卷统计区域的布局 5. 增加备注列显示 --- klp-ui/src/assets/styles/element-ui.scss | 3 +- klp-ui/src/components/CoilSelector/data.js | 29 +- klp-ui/src/components/CoilSelector/index.vue | 393 +++++++++++-------- 3 files changed, 243 insertions(+), 182 deletions(-) diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss index 9a16eafb..8e0d00d7 100644 --- a/klp-ui/src/assets/styles/element-ui.scss +++ b/klp-ui/src/assets/styles/element-ui.scss @@ -947,7 +947,8 @@ body { .el-dialog.is-fullscreen { .el-dialog__body { padding: $--spacing-lg; - max-height: calc(100vh - 100px); + height: calc(100vh - 100px); + max-height: 100vh; overflow-y: auto; } } diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js index 3bcbc004..1234331d 100644 --- a/klp-ui/src/components/CoilSelector/data.js +++ b/klp-ui/src/components/CoilSelector/data.js @@ -1,5 +1,4 @@ -export const defaultColumns = [ - { +export const defaultColumns = [{ label: '入场卷号', align: 'center', prop: 'enterCoilNo', @@ -30,6 +29,12 @@ export const defaultColumns = [ prop: 'specification', width: '100' }, + { + label: '重量(t)', + align: 'center', + prop: 'netWeight', + width: '100' + }, { label: '材质', align: 'center', @@ -42,12 +47,6 @@ export const defaultColumns = [ prop: 'manufacturer', width: '100' }, - { - label: '重量(t)', - align: 'center', - prop: 'netWeight', - width: '100' - }, { label: '库区', align: 'center', @@ -62,10 +61,10 @@ export const defaultColumns = [ width: '100', showOverflowTooltip: true }, - { - label: '备注', - align: 'center', - prop: 'remark', - showOverflowTooltip: true - } -] \ No newline at end of file + // { + // label: '备注', + // align: 'center', + // prop: 'remark', + // showOverflowTooltip: true + // } +] diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index c072d6b6..26701f9c 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -19,179 +19,190 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - 搜索 - 重置 - 显示钢卷地图 - 显示订单详情 - - + + 搜索 + 重置 + 全选当前卷 + 显示钢卷地图 + 显示订单详情 + + -
- - - + + +
+ + +
+ + + + + + + + + + + + + +
+ + 总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t + + + +
+
确认选择 取消 @@ -503,6 +514,42 @@ export default { this.selectedCoils = this.selectedCoils.filter(item => item.coilId !== row.coilId); }, + // 全选当前页 + handleSelectAllCurrentPage() { + if (!this.multiple) return; + + const warehouseIds = ['1988150210872930306', '1988150380649967617', '1988150800092950529', '1988151027466170370']; + const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']; + + // 遍历当前页的所有钢卷 + this.coilList.forEach(row => { + // 检查是否已选中 + if (this.selectedCoils.some(item => item.coilId === row.coilId)) { + return; + } + + // 禁用O卷检查逻辑 + if (this.disableO) { + // 如果没有判级且不在指定库区，不能选择 + if (!row.qualityStatus && !warehouseIds.includes(row.warehouseId)) { + return; + } + // 如果是禁用等级，不能选择 + if (disabledOList.includes(row.qualityStatus)) { + return; + } + } + + // 添加到已选列表 + this.selectedCoils.push(row); + }); + }, + + // 全部清除已选 + handleClearAllSelected() { + this.selectedCoils = []; + }, + handleConfirm() { this.$emit('confirm', this.selectedCoils); this.selectedCoils = []; @@ -526,7 +573,7 @@ export default { }; queryPayload.selectType = queryPayload.itemType; const response = await listMaterialCoil(queryPayload); - const { pageNum, pageSize, excludeBound, orderBy, ...noPager } = queryPayload; + const { pageNum, pageSize, orderBy, ...noPager } = queryPayload; getCoilStatisticsList(noPager).then((res) => { console.log('钢卷统计数据:', res); this.coilTrimStatistics = res.data || {}; @@ -665,6 +712,13 @@ export default { gap: 8px; } +.coil-selector-drag-panel { + flex: 1; + min-height: 0; + overflow: hidden; + box-sizing: border-box; +} + // 未选择状态样式 .no-selection { padding: 8px 12px; @@ -727,15 +781,11 @@ export default { } ::v-deep .el-dialog__body { - padding: 20px; + padding: 0 !important; max-height: calc(100vh - 200px); - overflow-y: auto; -} - -// 多选模式拖拽面板容器样式 -.coil-selector-drag-panel { - height: 70vh; - max-height: 700px; + min-height: 500px; + overflow-y: hidden !important; + box-sizing: border-box; } // panelA容器样式 @@ -768,12 +818,19 @@ export default { flex-direction: column; height: 100%; overflow: hidden; + min-height: 0; + max-height: 100%; + box-sizing: border-box; } // 已选表格容器样式 .selected-table-wrapper { flex: 1; - overflow: hidden; + overflow-y: hidden; + overflow-x: hidden; + min-height: 0; + max-height: calc(100% - 30px); + box-sizing: border-box; } // 空面板样式 @@ -815,6 +872,10 @@ export default { // 已选钢卷统计信息样式 .selected-stats { + display: flex; + justify-content: space-between; + align-items: center; + .stats-content { display: flex; gap: 24px; From 07192f22bcd95e549d6d2524a64f3a51801292af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 11 May 2026 13:14:23 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat(planSheet):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8D=95=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实现了批量新增排产单明细的完整流程：添加批量新增按钮，开发批量选择合同和明细的对话框，支持搜索筛选合同、分页展示合同列表，多选明细后批量提交新增，新增成功后刷新列表 --- klp-ui/src/views/aps/planSheet/index.vue | 209 ++++++++++++++++++++++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/klp-ui/src/views/aps/planSheet/index.vue b/klp-ui/src/views/aps/planSheet/index.vue index 439065e8..4acda21c 100644 --- a/klp-ui/src/views/aps/planSheet/index.vue +++ b/klp-ui/src/views/aps/planSheet/index.vue @@ -9,6 +9,7 @@

{{ currentPlanSheetInfo.planSheetName || '排产单详情' }}

新增明细 + 批量新增 刷新
@@ -287,6 +288,75 @@ + + + +
+ +
+
选择合同
+ + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + +
+ +
+
+ + +
+
选择明细（多选）
+ + + + + + + + + + + + + + + +
+
+
+ 取消 + 确认新增 +
+ @@ -351,7 +421,31 @@ export default { // 订单明细加载状态 orderItemLoading: false, // 当前编辑的行 - currentEditingRow: null + currentEditingRow: null, + // 批量新增对话框 + batchAddDialogVisible: false, + // 批量查询参数 + batchQueryParams: { + pageNum: 1, + pageSize: 10, + contractCode: undefined, + customerName: undefined, + salesman: undefined + }, + // 批量订单列表 + batchOrderList: [], + // 批量订单总数 + batchOrderTotal: 0, + // 批量订单加载状态 + batchOrderLoading: false, + // 批量明细列表 + batchItemList: [], + // 批量明细加载状态 + batchItemLoading: false, + // 选中的合同 + selectedContract: null, + // 选中的明细 + selectedBatchItems: [] }; }, created() { @@ -582,6 +676,98 @@ export default { // 处理订单行点击 handleOrderSelect(row) { this.selectOrder(row); + }, + // 打开批量新增对话框 + handleBatchAdd() { + this.batchAddDialogVisible = true; + this.selectedContract = null; + this.selectedBatchItems = []; + this.getBatchOrderList(); + }, + // 获取批量订单列表 + getBatchOrderList() { + this.batchOrderLoading = true; + listOrder(this.batchQueryParams).then(response => { + this.batchOrderList = response.rows; + this.batchOrderTotal = response.total; + this.batchOrderLoading = false; + }); + }, + // 重置批量查询参数 + resetBatchQuery() { + this.batchQueryParams = { + pageNum: 1, + pageSize: 10, + contractCode: undefined, + customerName: undefined, + salesman: undefined + }; + this.getBatchOrderList(); + }, + // 选择批量合同 + selectBatchContract(row) { + this.selectedContract = row; + this.selectedBatchItems = []; + this.batchItemLoading = true; + listOrderItem({ orderId: row.orderId }).then(res => { + this.batchItemList = res.rows; + this.batchItemLoading = false; + }); + }, + // 处理批量明细选择变更 + handleBatchItemSelectionChange(selection) { + this.selectedBatchItems = selection; + }, + // 确认批量新增 + confirmBatchAdd() { + if (this.selectedBatchItems.length === 0) { + this.$message.warning('请至少选择一条明细'); + return; + } + + this.$confirm(`确认新增 ${this.selectedBatchItems.length} 条明细？`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const currentMaxSeqNo = this.planDetailList.length > 0 + ? Math.max(...this.planDetailList.map(item => parseInt(item.bizSeqNo) || 0)) + : 0; + + const addPromises = this.selectedBatchItems.map((item, index) => { + const newRow = { + planSheetId: this.currentPlanSheetId, + bizSeqNo: currentMaxSeqNo + index + 1, + orderCode: this.selectedContract.orderCode, + contractCode: this.selectedContract.contractCode, + customerName: this.selectedContract.companyName, + salesman: this.selectedContract.salesman, + orderId: this.selectedContract.orderId, + productName: item.productType, + productMaterial: item.material, + productWidth: item.width, + rollingThick: item.thickness, + markCoatThick: item.thickness, + tonSteelLengthRange: 0, + planQty: item.productNum, + planWeight: item.weight, + surfaceTreatment: item.surfaceTreatment, + productPackaging: item.packagingReq, + widthReq: item.edgeCuttingReq, + productEdgeReq: item.widthTolerance, + usageReq: item.purpose + }; + return addPlanDetail(newRow); + }); + + Promise.all(addPromises).then(() => { + this.$message.success('批量新增成功'); + this.batchAddDialogVisible = false; + this.getList(); + }).catch(error => { + this.$message.error('批量新增失败'); + }); + }); } } }; @@ -654,4 +840,25 @@ export default { /* ::v-deep .el-input__inner { padding: 0 1px; } */ + +.batch-add-content { + padding: 10px 0; +} + +.contract-section { + margin-bottom: 30px; + padding-bottom: 20px; + border-bottom: 1px solid #eee; +} + +.item-section { + margin-top: 20px; +} + +.section-title { + font-size: 14px; + font-weight: 600; + margin-bottom: 15px; + color: #303133; +} From 83f04bf5cdd21923e0517892a995268c90a8fca1 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 11 May 2026 14:35:41 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat(framework):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E5=85=A5=E5=9C=BA=E5=8D=B7=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=AE=9E=E9=99=85SEG=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在SqlServerApiBusinessService中新增getSegByHotCoilId方法 - 在SqlServerApiClient中新增queryProSegByHotCoilId数据库查询接口 - 在SqlServerApiController中新增/seg-by-hotcoil/{hotCoilId} REST API端点 - 实现基于HOT_COILID字段的数据库查询逻辑 - 添加相应的JavaDoc注释说明功能用途 --- .../java/com/klp/framework/client/SqlServerApiClient.java | 8 ++++++++ .../framework/service/SqlServerApiBusinessService.java | 7 +++++++ .../klp/framework/sqlserver/SqlServerApiController.java | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java index 57b16b49..859e8a77 100644 --- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java +++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java @@ -368,6 +368,14 @@ public class SqlServerApiClient { ); } + public ExecuteSqlResponse queryProSegByHotCoilId(String hotCoilId) { + return executeSql( + "oracle", + "select * from JXPLTCM.PLTCM_PRO_SEG where HOT_COILID = :hotCoilId order by SEGNO", + singletonParam("hotCoilId", hotCoilId) + ); + } + public ExecuteSqlResponse queryProSegByExcoilId(String excoilId) { return executeSql( "oracle", diff --git a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java index ef66dff2..727061c6 100644 --- a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java +++ b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java @@ -89,6 +89,13 @@ public class SqlServerApiBusinessService { return SegSeriesView.fromExecuteSqlResponse(encoilId, client.queryProSegByEncoilId(encoilId)); } + /** + * 钢卷实际 SEG 查询：按入场卷号查询。 + */ + public SegSeriesView getSegByHotCoilId(String hotCoilId) { + return SegSeriesView.fromExecuteSqlResponse(hotCoilId, client.queryProSegByHotCoilId(hotCoilId)); + } + /** * 钢卷实际 SEG 查询：按出口卷号查询。 */ diff --git a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java index 14454bbd..eb6ed518 100644 --- a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java +++ b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java @@ -62,6 +62,14 @@ public class SqlServerApiController { return R.ok(businessService.getSegSeriesViewByEncoilId(encoilId)); } + /** + * 钢卷实际 SEG，按入场卷号查询。 + */ + @GetMapping("/seg-by-hotcoil/{hotCoilId}") + public R segByHotCoilId(@PathVariable String hotCoilId) { + return R.ok(businessService.getSegByHotCoilId(hotCoilId)); + } + /** * 钢卷实际 SEG，按出口卷号查询。 */ From 90cb7f4e99fec6ba65c461b3c8ea447825289de9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 11 May 2026 14:48:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat(SqlServerApiClient):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=83=AD=E5=8D=B7ID=E6=9F=A5=E8=AF=A2=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E6=AE=B5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加ArrayList导入用于存储COILID列表 - 修改queryProSegByHotCoilId方法实现分步查询 - 首先从PLTCM_PDI_PLAN表查询COILID - 添加空结果检查和异常处理逻辑 - 收集有效的COILID并过滤空值 - 使用IN查询一次性获取PLTCM_PRO_SEG表数据 - 按ENCOILID和SEGNO排序返回结果 --- .../framework/client/SqlServerApiClient.java | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java index 859e8a77..7728b9dd 100644 --- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java +++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java @@ -10,6 +10,7 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import java.net.URI; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -369,11 +370,47 @@ public class SqlServerApiClient { } public ExecuteSqlResponse queryProSegByHotCoilId(String hotCoilId) { - return executeSql( + // 先通过 HOT_COILID 从 PLTCM_PDI_PLAN 表查询到所有的 COILID + ExecuteSqlResponse planResponse = executeSql( "oracle", - "select * from JXPLTCM.PLTCM_PRO_SEG where HOT_COILID = :hotCoilId order by SEGNO", + "select COILID from JXPLTCM.PLTCM_PDI_PLAN where HOT_COILID = :hotCoilId", singletonParam("hotCoilId", hotCoilId) ); + + List> rows = (List>) planResponse.getResult(); + if (rows == null || rows.isEmpty()) { + // 如果没有找到对应的计划记录，返回空结果 + return new ExecuteSqlResponse(); + } + + // 收集所有有效的 COILID + List coilIds = new ArrayList<>(); + for (Map row : rows) { + String coilId = (String) row.get("COILID"); + if (coilId != null && !coilId.trim().isEmpty()) { + coilIds.add(coilId); + } + } + + if (coilIds.isEmpty()) { + return new ExecuteSqlResponse(); + } + + // 用所有的 COILID 去查询 PLTCM_PRO_SEG 表的 ENCOILID + // 使用 IN 查询一次性获取所有数据 + Map params = new java.util.HashMap<>(); + StringBuilder sql = new StringBuilder("select * from JXPLTCM.PLTCM_PRO_SEG where ENCOILID IN ("); + for (int i = 0; i < coilIds.size(); i++) { + if (i > 0) { + sql.append(", "); + } + String paramName = "coilId" + i; + sql.append(":").append(paramName); + params.put(paramName, coilIds.get(i)); + } + sql.append(") order by ENCOILID, SEGNO"); + + return executeSql("oracle", sql.toString(), params); } public ExecuteSqlResponse queryProSegByExcoilId(String excoilId) { From 6cbb7f3c18c5e0f019ddfe993eb61a10422ca948 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 11 May 2026 14:53:06 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat(SqlServerApi):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E7=83=AD=E5=8D=B7=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 /plans-by-hotcoil/{hotCoilId} 接口 - 实现按热卷号查询计划详情的功能 - 添加相关 API 文档注释 --- .../klp/framework/sqlserver/SqlServerApiController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java index eb6ed518..58eb94c1 100644 --- a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java +++ b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java @@ -54,6 +54,14 @@ public class SqlServerApiController { return R.ok(businessService.getPlanByCoilId(coilId)); } + /** + * 计划详情：按热卷号查询。 + */ + @GetMapping("/plans-by-hotcoil/{hotCoilId}") + public R planDetailByHotCoilId(@PathVariable String hotCoilId) { + return R.ok(businessService.getPlanByHotCoilId(hotCoilId)); + } + /** * 钢卷实际 SEG，按入口卷号查询。 */ From f102ef350b838578008ad4b06116dfd07a394843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 11 May 2026 15:03:32 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix(wms/coil/info):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整生产数据加载逻辑，先通过热轧卷号查询计划详情获取卷号，再调用时序数据接口，修复直接使用当前卷号可能取不到数据的问题 --- klp-ui/src/api/l2/timing.js | 16 ++++++++++++++++ klp-ui/src/views/wms/coil/info.vue | 11 ++++++++--- klp-ui/src/views/wms/delivery/waybill/index.vue | 9 +++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/klp-ui/src/api/l2/timing.js b/klp-ui/src/api/l2/timing.js index af5cbdeb..576aea04 100644 --- a/klp-ui/src/api/l2/timing.js +++ b/klp-ui/src/api/l2/timing.js @@ -33,6 +33,22 @@ export function getTimingSegByEncoilId(encoilId) { }) } +export function getTimingSegByHotcoilId(encoilId) { + return request({ + url: '/sql-server-api/seg-by-hotcoil/' + encoilId, + method: 'get' + }) +} + +// 根据热卷好查询计划详情 +export function getTimingPlanDetailByHotcoilId(hotcoilId) { + return request({ + url: '/sql-server-api/plans-by-hotcoil/' + hotcoilId, + method: 'get' + }) +} + + // 钢卷实际 SEG，按出口卷号查询 export function getTimingSegByExcoilId(excoilId) { return request({ diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue index fda62694..c9c297da 100644 --- a/klp-ui/src/views/wms/coil/info.vue +++ b/klp-ui/src/views/wms/coil/info.vue @@ -766,7 +766,7 @@ import { listTransferOrderItem } from '@/api/wms/transferOrderItem' import { listCoilQualityRejudge } from '@/api/wms/coilQualityRejudge' // 引入 ECharts 和 L2 时序数据 API import * as echarts from 'echarts' -import { getTimingSegByEncoilId } from '@/api/l2/timing' +import { getTimingSegByEncoilId, getTimingPlanDetailByHotcoilId } from '@/api/l2/timing' import AbnormalTable from '@/views/wms/coil/components/AbnormalTable.vue'; import FileList from "@/components/FileList"; @@ -1176,11 +1176,16 @@ export default { }, // 加载生产数据 async loadProductionData() { - const encoilId = this.coilInfo.currentCoilNo; - if (!encoilId) return; + const hotCoilId = this.coilInfo.enterCoilNo; + if (!hotCoilId) return; this.perfLoading = true; try { + // 先查询详情 + const detail = await getTimingPlanDetailByHotcoilId(hotCoilId); + const encoilId = detail?.data?.firstRow?.coilid || ''; + if (!encoilId) return; + const res = await getTimingSegByEncoilId(encoilId); const series = res?.data?.series || null; const rows = res?.data?.rows || []; diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index 9a165f68..3859f3e3 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -47,6 +47,15 @@ :value="item.value" /> + + + + + + + + + 搜索 重置 From 7eab286e527a1f3ef21aafe4f7ed598dda866616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 11 May 2026 15:12:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?feat(crm/objection):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=85=B3=E8=81=94=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为销售异议列表、新增/编辑弹窗、详情页添加钢卷信息展示列 2. 新增钢卷选择组件，支持按订单筛选可发货钢卷 3. 实现钢卷的选择、移除、跳转详情功能 4. 改造提交接口，传递钢卷ID列表 5. 重构原有组件逻辑，优化表单处理流程 --- .../views/crm/components/OrderObjection.vue | 297 +++++++++++------- klp-ui/src/views/crm/objection/index.vue | 120 ++++++- 2 files changed, 303 insertions(+), 114 deletions(-) diff --git a/klp-ui/src/views/crm/components/OrderObjection.vue b/klp-ui/src/views/crm/components/OrderObjection.vue index 88d53e40..869153a8 100644 --- a/klp-ui/src/views/crm/components/OrderObjection.vue +++ b/klp-ui/src/views/crm/components/OrderObjection.vue @@ -42,6 +42,16 @@ 已关闭 + + + - @@ -113,28 +112,28 @@ placeholder="请输入客户诉求" > - @@ -150,17 +149,6 @@ -
确 定 @@ -180,6 +168,14 @@
+ +
+
+ +
+
+ - +
关 闭 @@ -190,9 +186,16 @@ diff --git a/klp-ui/src/views/wms/processSpec/planSpec.vue b/klp-ui/src/views/wms/processSpec/planSpec.vue index 28dbc5c3..33729ea8 100644 --- a/klp-ui/src/views/wms/processSpec/planSpec.vue +++ b/klp-ui/src/views/wms/processSpec/planSpec.vue @@ -211,7 +211,7 @@ - +
From 7b1827ed833363a4f2500301c5b596aa4318b232 Mon Sep 17 00:00:00 2001 From: wangyu <823267011@qq.com> Date: Mon, 11 May 2026 15:44:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=81=9C=E6=9C=BA=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/client/SqlServerApiClient.java | 39 +- .../service/SqlServerApiBusinessService.java | 56 + .../sqlserver/SqlServerApiController.java | 28 + klp-ui/package.json | 1 + klp-ui/src/api/l2/timing.js | 25 + .../acid/components/ActualPerformance.vue | 960 ++++++++++++++++++ .../pages/acid/components/Performance.vue | 895 +++++++++------- klp-ui/src/views/micro/pages/acid/index.vue | 18 +- 8 files changed, 1633 insertions(+), 389 deletions(-) create mode 100644 klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java index 7728b9dd..7b990455 100644 --- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java +++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java @@ -376,13 +376,13 @@ public class SqlServerApiClient { "select COILID from JXPLTCM.PLTCM_PDI_PLAN where HOT_COILID = :hotCoilId", singletonParam("hotCoilId", hotCoilId) ); - + List> rows = (List>) planResponse.getResult(); if (rows == null || rows.isEmpty()) { // 如果没有找到对应的计划记录，返回空结果 return new ExecuteSqlResponse(); } - + // 收集所有有效的 COILID List coilIds = new ArrayList<>(); for (Map row : rows) { @@ -391,11 +391,11 @@ public class SqlServerApiClient { coilIds.add(coilId); } } - + if (coilIds.isEmpty()) { return new ExecuteSqlResponse(); } - + // 用所有的 COILID 去查询 PLTCM_PRO_SEG 表的 ENCOILID // 使用 IN 查询一次性获取所有数据 Map params = new java.util.HashMap<>(); @@ -409,10 +409,39 @@ public class SqlServerApiClient { params.put(paramName, coilIds.get(i)); } sql.append(") order by ENCOILID, SEGNO"); - + return executeSql("oracle", sql.toString(), params); } + public ExecuteSqlResponse queryExcoilList(int page, int pageSize) { + int endRow = page * pageSize; + int startRow = endRow - pageSize; + Map params = new java.util.HashMap<>(); + params.put("startRow", startRow); + params.put("endRow", endRow); + return executeSql( + "oracle", + "select * from (select t.*, ROWNUM rn from (select * from JXPLTCM.PLTCM_PDO_EXCOIL order by END_DATE desc) t where ROWNUM <= :endRow) where rn > :startRow", + params + ); + } + + public ExecuteSqlResponse queryExcoilCount() { + return executeSql( + "oracle", + "select count(*) as total from JXPLTCM.PLTCM_PDO_EXCOIL", + emptyParams() + ); + } + + public ExecuteSqlResponse queryPresetSetupByCoilId(String coilId) { + return executeSql( + "oracle", + "select * from JXPLTCM.PLTCM_PRESET_SETUP where COILID = :coilId", + singletonParam("coilId", coilId) + ); + } + public ExecuteSqlResponse queryProSegByExcoilId(String excoilId) { return executeSql( "oracle", diff --git a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java index 727061c6..f5c9544d 100644 --- a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java +++ b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java @@ -126,6 +126,32 @@ public class SqlServerApiBusinessService { return client.queryShapeByMatId(matId); } + /** + * 出口卷实绩列表（分页），来自 PLTCM_PDO_EXCOIL。 + */ + public ExcoilPageView getExcoilList(int page, int pageSize) { + return new ExcoilPageView(asRowList(client.queryExcoilList(page, pageSize))); + } + + /** + * 出口卷实绩总数。 + */ + public long getExcoilCount() { + List> rows = asRowList(client.queryExcoilCount()); + if (rows.isEmpty()) return 0L; + Number n = asNumber(rows.get(0).get("total")); + return n == null ? 0L : n.longValue(); + } + + /** + * 工艺预设参数，按钢卷号查询（PLTCM_PRESET_SETUP）。 + */ + public PresetSetupView getPresetSetupByCoilId(String coilId) { + List> rows = asRowList(client.queryPresetSetupByCoilId(coilId)); + Map firstRow = rows.isEmpty() ? Collections.emptyMap() : rows.get(0); + return new PresetSetupView(coilId, firstRow); + } + /** * 实时数据总入口：一次性返回厚度与板形两类数据。 */ @@ -361,6 +387,36 @@ public class SqlServerApiBusinessService { } } + public static class ExcoilPageView { + private final List> rows; + + public ExcoilPageView(List> rows) { + this.rows = rows; + } + + public List> getRows() { + return rows; + } + } + + public static class PresetSetupView { + private final String coilId; + private final Map data; + + public PresetSetupView(String coilId, Map data) { + this.coilId = coilId; + this.data = data; + } + + public String getCoilId() { + return coilId; + } + + public Map getData() { + return data; + } + } + public static class RollListView { private final List> rows; diff --git a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java index 58eb94c1..fd7e144c 100644 --- a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java +++ b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java @@ -155,6 +155,34 @@ public class SqlServerApiController { return R.ok(businessService.getRollHistoryList(page, pageSize, rollId, standId)); } + /** + * 出口卷实绩列表（分页），来自 PLTCM_PDO_EXCOIL。 + */ + @GetMapping("/excoil") + public R excoilList( + @RequestParam(defaultValue = "1") int page, + @RequestParam(defaultValue = "50") int pageSize) { + return R.ok(businessService.getExcoilList(page, pageSize)); + } + + /** + * 出口卷实绩总数。 + */ + @GetMapping("/excoil/count") + public R> excoilCount() { + Map result = new HashMap<>(); + result.put("total", businessService.getExcoilCount()); + return R.ok(result); + } + + /** + * 工艺预设参数，按计划钢卷号查询（PLTCM_PRESET_SETUP）。 + */ + @GetMapping("/preset-setup/{coilId}") + public R presetSetup(@PathVariable String coilId) { + return R.ok(businessService.getPresetSetupByCoilId(coilId)); + } + /** * 换辊历史总条数。 */ diff --git a/klp-ui/package.json b/klp-ui/package.json index f6a6a48c..2a2d5e7b 100644 --- a/klp-ui/package.json +++ b/klp-ui/package.json @@ -50,6 +50,7 @@ "dayjs": "^1.11.18", "dom-to-image": "^2.6.0", "echarts": "5.4.0", + "echarts-gl": "^2.0.9", "element-ui": "2.15.12", "exceljs": "^4.4.0", "file-saver": "2.0.5", diff --git a/klp-ui/src/api/l2/timing.js b/klp-ui/src/api/l2/timing.js index 576aea04..43ebc625 100644 --- a/klp-ui/src/api/l2/timing.js +++ b/klp-ui/src/api/l2/timing.js @@ -117,3 +117,28 @@ export function getRollHistoryCount(rollId, standId) { params: { rollId, standId } }) } + +// 出口卷实绩列表（分页），PLTCM_PDO_EXCOIL +export function getExcoilList(page = 1, pageSize = 50) { + return request({ + url: '/sql-server-api/excoil', + method: 'get', + params: { page, pageSize } + }) +} + +// 出口卷实绩总数 +export function getExcoilCount() { + return request({ + url: '/sql-server-api/excoil/count', + method: 'get' + }) +} + +// 工艺预设参数，按计划钢卷号查询，PLTCM_PRESET_SETUP +export function getPresetSetupByCoilId(coilId) { + return request({ + url: '/sql-server-api/preset-setup/' + coilId, + method: 'get' + }) +} diff --git a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue new file mode 100644 index 00000000..eef9814f --- /dev/null +++ b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue @@ -0,0 +1,960 @@ + + + + + diff --git a/klp-ui/src/views/micro/pages/acid/components/Performance.vue b/klp-ui/src/views/micro/pages/acid/components/Performance.vue index c80afd04..597014af 100644 --- a/klp-ui/src/views/micro/pages/acid/components/Performance.vue +++ b/klp-ui/src/views/micro/pages/acid/components/Performance.vue @@ -1,483 +1,628 @@ @@ -994,6 +1166,31 @@ export default { // 调拨记录弹窗 transferRecordVisible: false, transferRecordList: [], + // 暂存单据管理相关数据 + tempOrderList: [], + currentTempOrder: null, + coilSelectionVisible: false, + selectedCoilsVisible: false, + coilLoading: false, + availableCoils: [], + selectedCoils: [], + coilTotal: 0, + coilQueryParams: { + pageNum: 1, + pageSize: 20, + enterCoilNo: '', + currentCoilNo: '', + itemName: '', + itemSpecification: '', + itemMaterial: '', + status: 0, + orderBy: true, + dataType: 1, + materialType: '成品', + itemType: 'product', + excludeBound: true, + selectType: 'product' + }, }; }, computed: { @@ -1021,8 +1218,257 @@ export default { this.warehouseIds = this.warehouseOptions.map(item => item.value).join(','); } this.getList(); + // 初始化暂存单据列表 + this.loadTempOrderList(); }, methods: { + // === 暂存单据管理相关方法 === + // 加载暂存单据列表 + loadTempOrderList() { + const savedOrders = localStorage.getItem('tempCoilOrders'); + if (savedOrders) { + this.tempOrderList = JSON.parse(savedOrders); + } else { + this.tempOrderList = []; + } + }, + + // 保存暂存单据列表到本地存储 + saveTempOrderList() { + localStorage.setItem('tempCoilOrders', JSON.stringify(this.tempOrderList)); + }, + + // 创建暂存单据 + createTempOrder() { + const orderName = `暂存单据_${new Date().toLocaleString().replace(/[/:]/g, '-')}`; + const newOrder = { + orderId: Date.now().toString(), + orderName: orderName, + createTime: new Date().toLocaleString(), + coils: [] + }; + + this.tempOrderList.unshift(newOrder); + this.saveTempOrderList(); + + this.$message.success('暂存单据创建成功'); + }, + + // 删除暂存单据 + deleteTempOrder(order) { + this.$confirm(`确认删除暂存单据"${order.orderName}"吗？`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const index = this.tempOrderList.findIndex(item => item.orderId === order.orderId); + if (index > -1) { + this.tempOrderList.splice(index, 1); + this.saveTempOrderList(); + this.$message.success('删除成功'); + } + }).catch(() => { + this.$message.info('已取消删除'); + }); + }, + + // 查看已选钢卷列表 + viewSelectedCoils(order) { + this.currentTempOrder = order; + this.selectedCoilsVisible = true; + }, + + // 编辑单据名称 + editOrderName(order) { + this.$prompt('请输入新的单据名称', '编辑单据名称', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputValue: order.orderName, + inputValidator: (value) => { + if (!value || value.trim() === '') { + return '单据名称不能为空'; + } + return true; + } + }).then(({ value }) => { + const newName = value.trim(); + // 检查名称是否重复 + const duplicateOrder = this.tempOrderList.find(item => + item.orderId !== order.orderId && item.orderName === newName + ); + + if (duplicateOrder) { + this.$message.warning('单据名称已存在，请使用其他名称'); + return; + } + + // 更新单据名称 + order.orderName = newName; + this.saveTempOrderList(); + this.$message.success('单据名称修改成功'); + }).catch(() => { + this.$message.info('已取消编辑'); + }); + }, + + // 打开钢卷选择对话框 + openCoilSelection(order) { + this.currentTempOrder = order; + this.coilSelectionVisible = true; + this.searchCoils(); + }, + + // 计算总重量 + calculateTotalWeight(coils) { + if (!coils || coils.length === 0) return 0; + return coils.reduce((total, coil) => { + return total + (parseFloat(coil.netWeight) || 0); + }, 0); + }, + + // 计算选中钢卷的总重量 + calculateSelectedWeight() { + return this.calculateTotalWeight(this.selectedCoils); + }, + + // 查询钢卷 + async searchCoils() { + this.coilLoading = true; + try { + // 构建查询参数 + const params = { ...this.coilQueryParams }; + + // 移除空值参数 + Object.keys(params).forEach(key => { + if (params[key] === '' || params[key] === null || params[key] === undefined) { + delete params[key]; + } + }); + + // 调用接口查询钢卷 + const response = await listMaterialCoil(params); + this.availableCoils = response.rows || []; + this.coilTotal = response.total || 0; + + // 过滤掉所有单据中已选择的钢卷，确保钢卷在所有单据中唯一 + const allExistingCoilIds = []; + this.tempOrderList.forEach(order => { + if (order.coils && Array.isArray(order.coils)) { + order.coils.forEach(coil => { + if (coil.coilId) { + allExistingCoilIds.push(coil.coilId); + } + }); + } + }); + + // 如果是当前正在编辑的单据，排除当前单据中的钢卷（因为它们已经在allExistingCoilIds中了） + // 这样可以确保其他单据不能选择当前单据已选的钢卷 + this.availableCoils = this.availableCoils.filter(coil => !allExistingCoilIds.includes(coil.coilId)); + + } catch (error) { + console.error('查询钢卷失败:', error); + this.$message.error('查询钢卷失败'); + } finally { + this.coilLoading = false; + } + }, + + // 重置钢卷查询条件 + resetCoilQuery() { + this.coilQueryParams = { + pageNum: 1, + pageSize: 20, + enterCoilNo: '', + currentCoilNo: '', + itemName: '', + itemSpecification: '', + itemMaterial: '', + status: 0, + orderBy: true, + dataType: 1, + materialType: '成品', + itemType: 'product', + excludeBound: true, + selectType: 'product' + }; + this.searchCoils(); + }, + + // 处理钢卷选择变化 + handleCoilSelection(selection) { + this.selectedCoils = selection; + }, + + // 保存选中的钢卷 + saveSelectedCoils() { + if (!this.currentTempOrder) { + this.$message.error('请先选择暂存单据'); + return; + } + + if (this.selectedCoils.length === 0) { + this.$message.warning('请选择要添加的钢卷'); + return; + } + + // 确保coils数组存在 + if (!this.currentTempOrder.coils) { + this.currentTempOrder.coils = []; + } + + // 由于在查询阶段已经过滤了所有重复的钢卷，这里不需要再次检查 + // 但为了安全起见，保留基本的检查逻辑 + if (this.currentTempOrder.coils && this.currentTempOrder.coils.length > 0) { + const existingCoilIds = this.currentTempOrder.coils.map(coil => coil.coilId); + const duplicateCoils = this.selectedCoils.filter(coil => existingCoilIds.includes(coil.coilId)); + + if (duplicateCoils.length > 0) { + this.$message.warning(`钢卷 ${duplicateCoils.map(coil => coil.enterCoilNo).join(', ')} 已存在，不能重复添加`); + return; + } + } + + // 添加钢卷到当前单据 + this.currentTempOrder.coils.push(...this.selectedCoils); + this.saveTempOrderList(); + + this.$message.success(`成功添加 ${this.selectedCoils.length} 个钢卷`); + + // 关闭对话框并重置选择 + this.coilSelectionVisible = false; + this.selectedCoils = []; + }, + + // 从单据中移除钢卷 + removeCoilFromOrder(index) { + if (!this.currentTempOrder || !this.currentTempOrder.coils || !this.currentTempOrder.coils[index]) return; + + this.$confirm('确认移除该钢卷吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.currentTempOrder.coils.splice(index, 1); + this.saveTempOrderList(); + this.$message.success('移除成功'); + }).catch(() => { + this.$message.info('已取消移除'); + }); + }, + + // 钢卷分页相关方法 + handleCoilSizeChange(val) { + this.coilQueryParams.pageSize = val; + this.coilQueryParams.pageNum = 1; + this.searchCoils(); + }, + + handleCoilCurrentChange(val) { + this.coilQueryParams.pageNum = val; + this.searchCoils(); + }, + // 进入数字钢卷页面 handleNumberCoilClick(row) { this.$router.push({