diff --git a/klp-ui/src/api/wms/attendance.js b/klp-ui/src/api/wms/attendance.js index ee4765b6..8de38d68 100644 --- a/klp-ui/src/api/wms/attendance.js +++ b/klp-ui/src/api/wms/attendance.js @@ -45,12 +45,14 @@ export function delRecords(id) { } // 同步考勤记录 -export function syncRecords(starttime) { +export function syncRecords({ starttime, endtime }) { return attendanceRequest({ url: '/sync_attendance', method: 'post', + timeout: 60000, data: { - starttime + starttime, + endtime } }) } diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js index 9ff3f2f3..8b267787 100644 --- a/klp-ui/src/components/CoilSelector/data.js +++ b/klp-ui/src/components/CoilSelector/data.js @@ -11,6 +11,12 @@ export const defaultColumns = [ prop: 'currentCoilNo', showOverflowTooltip: true }, + { + label: '镀铬卷号', + align: 'center', + prop: 'chromelCoilNo', + showOverflowTooltip: true + }, { label: '存储位置', align: 'center', @@ -83,6 +89,12 @@ export const fullPageDefaultColumns = [ prop: 'currentCoilNo', showOverflowTooltip: true }, + { + label: '镀铬卷号', + align: 'center', + prop: 'chromelCoilNo', + showOverflowTooltip: true + }, { label: '存储位置', align: 'center', @@ -171,6 +183,7 @@ export const fullPageDefaultColumns = [ export const optionalColumns = [ { label: '入场卷号', value: 'enterCoilNo' }, { label: '当前卷号', value: 'currentCoilNo' }, + { label: '镀铬卷号', value: 'chromelCoilNo' }, { label: '厂家钢卷号', value: 'supplierCoilNo' }, { label: '逻辑库区', value: 'warehouseName' }, { label: '实际库区', value: 'actualWarehouseName' }, diff --git a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue index 303f673b..344a1858 100644 --- a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue +++ b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue @@ -64,7 +64,7 @@ {{ coil.netWeight }}t
- 长度: + 参考长度: {{ coil.length }}m
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index f6ca23da..c8288ac7 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -1,5 +1,5 @@ @@ -1237,4 +1373,4 @@ export default { .plan-sheet-section { margin-top: 16px; } - \ No newline at end of file + diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index 862e4e12..a65086c0 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -60,14 +60,20 @@
- -
- {{ '更新信息' }} -
- 暂存内容 - 保存更新 + +
+ {{ '更新信息' }} +
+ 暂存内容 + 保存更新 +
-
+ + + +
@@ -530,6 +536,10 @@ export default { isDrAction() { return this.actionType === 504 || this.actionType === 524 }, + /** 镀锌/酸轧产线免验净重和厚度范围 */ + isExemptFromValidation() { + return [11, 120, 200, 201, 520, 202, 501, 521].includes(Number(this.actionType)) + }, // 动态显示标签 getItemLabel() { if (this.updateForm.materialType === '成品') { @@ -814,6 +824,22 @@ export default { } } + // 校验净重和实测厚度不超过源卷(镀锌/酸轧除外) + if (!this.isExemptFromValidation) { + const parentNetWeight = parseFloat(this.currentInfo.netWeight) || 0 + const parentThickness = parseFloat(this.currentInfo.actualThickness) || 0 + const updateNetWeight = parseFloat(this.updateForm.netWeight) || 0 + const updateThickness = parseFloat(this.updateForm.actualThickness) || 0 + if (updateNetWeight > 0 && parentNetWeight > 0 && updateNetWeight > parentNetWeight) { + this.$message.error(`更新后净重(${updateNetWeight}T)不能超过源卷净重(${parentNetWeight}T)`) + return false + } + if (updateThickness > 0 && parentThickness > 0 && updateThickness > parentThickness) { + this.$message.error(`更新后实测厚度(${updateThickness}mm)不能超过源卷实测厚度(${parentThickness}mm)`) + return false + } + } + const loadingInstance = this.$loading({ lock: true, text: '正在更新钢卷信息,请稍后...', diff --git a/klp-ui/src/views/wms/hrm/attendance/sync.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue index f1019ce8..ec31b126 100644 --- a/klp-ui/src/views/wms/hrm/attendance/sync.vue +++ b/klp-ui/src/views/wms/hrm/attendance/sync.vue @@ -1,66 +1,66 @@