diff --git a/src/views/PurchasingManagement/OrderInquiry/index.vue b/src/views/PurchasingManagement/OrderInquiry/index.vue index 7c88a7a8..de4d60af 100644 --- a/src/views/PurchasingManagement/OrderInquiry/index.vue +++ b/src/views/PurchasingManagement/OrderInquiry/index.vue @@ -470,7 +470,7 @@
取消 - 确定 + 确定
@@ -711,6 +711,10 @@ export default { limit: 20, Data: {}, upload: url, + uploadSaving: false, + uploadFileTotal: 0, + uploadFileFinished: 0, + uploadFileFailed: 0, consignee: '', receiverTelephoneNumber: '', loading: false, // 数据加载 @@ -1025,10 +1029,15 @@ export default { now.getSeconds().toString().padStart(2, '0') + now.getMilliseconds().toString().padStart(3, '0') const suffix = file.name.split('.').pop() || 'jpg' - const savePath = MESUploadFileNew_BasePath + '\\OrderInquiry\\' + timestamp + '-' + this.purchaseContractID + '.' + suffix + const lastDotIndex = file.name.lastIndexOf('.') + const fileName = lastDotIndex > -1 ? file.name.slice(0, lastDotIndex) : file.name + const sqlFileName = fileName.replace(/'/g, "''") + const sqlSuffix = suffix.replace(/'/g, "''") + const uniqueCode = Math.random().toString(36).slice(2, 8) + const savePath = MESUploadFileNew_BasePath + '\\OrderInquiry\\' + timestamp + '-' + this.purchaseContractID + '-' + uniqueCode + '.' + suffix // 构造SQL语句 - const sqlStatement = `update 采购管理_采购合同查询_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 采购管理_采购合同查询_图片 where 采购合同流水号 = ${this.purchaseContractID} and 文件路径 is null order by 操作时间 desc)` + const sqlStatement = `update 采购管理_采购合同查询_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 采购管理_采购合同查询_图片 where 采购合同流水号 = ${this.purchaseContractID} and 文件名称 = N'${sqlFileName}' and 文件后缀 = N'${sqlSuffix}' and 文件路径 is null order by 操作时间 desc, id desc); IF @@ROWCOUNT <> 1 RAISERROR(N'图片路径回填失败', 16, 1)` // 调用新接口保存文件 const formData = new FormData() @@ -1042,10 +1051,24 @@ export default { if (response.data && response.data[0] && response.data[0].result === '1') { console.log('文件保存成功:', savePath) } else { + this.uploadFileFailed++ console.error('文件保存失败:', response.data) } }).catch(err => { + this.uploadFileFailed++ console.error('文件保存异常:', err) + }).finally(() => { + this.uploadFileFinished++ + if (this.uploadFileFinished >= this.uploadFileTotal) { + this.uploadSaving = false + if (this.uploadFileFailed === 0) { + this.$message.success('图片上传成功') + this.dialogFormVisible2 = false + this.$refs.upload.clearFiles() + } else { + this.$message.error('部分图片上传失败，请重新上传失败图片') + } + } }) // this.dialogFormVisible2 = false @@ -1060,6 +1083,14 @@ export default { // } }, submitPicture() { + if (!this.$refs.upload || this.$refs.upload.uploadFiles.length === 0) { + this.$message.warning('请选择图片') + return + } + this.uploadSaving = true + this.uploadFileTotal = this.$refs.upload.uploadFiles.length + this.uploadFileFinished = 0 + this.uploadFileFailed = 0 var param = [] param[0] = ['采购合同流水号', this.purchaseContractID] param[1] = ['文件名称', ''] @@ -1068,8 +1099,6 @@ export default { var Data1 = this.CreateData('15', '采购合同查询_上传图片', param) this.Data.param = Data1 this.$refs.upload.submit() - this.dialogFormVisible2 = false - this.$refs.upload.clearFiles() }, exportTable(row) { this.supplier = row.供应商 @@ -1469,31 +1498,13 @@ export default { if (this.arrivalTableData.length === 0) { this.$message.info('该合同下没有物料明细') } - // 生成入库单号：RK + 年月日 + 采购合同流水号 + 当天自增序号 - this.generate入库单号() + // 从后端获取入库单号 + if (response.data.length > 0 && response.data[0].入库单号) { + this.入库单号 = response.data[0].入库单号 + } }) }, - generate入库单号() { - var now = new Date() - var year = now.getFullYear() - var month = (now.getMonth() + 1).toString().padStart(2, '0') - var day = now.getDate().toString().padStart(2, '0') - var dateStr = '' + year + month + day - var storageKey = 'RK_SEQ_' + dateStr - var currentSeq = parseInt(localStorage.getItem(storageKey) || '0') + 1 - var seqStr = currentSeq.toString().padStart(1, '0') - this.入库单号 = 'RK' + dateStr + this.arrivalContractNo + seqStr - }, - increment入库单号Seq() { - var now = new Date() - var year = now.getFullYear() - var month = (now.getMonth() + 1).toString().padStart(2, '0') - var day = now.getDate().toString().padStart(2, '0') - var dateStr = '' + year + month + day - var storageKey = 'RK_SEQ_' + dateStr - var currentSeq = parseInt(localStorage.getItem(storageKey) || '0') + 1 - localStorage.setItem(storageKey, currentSeq.toString()) - }, + submitArrivalNotice() { const arrivalData = this.arrivalTableData.filter(item => item.到货数量 > 0) if (arrivalData.length === 0) { @@ -1528,7 +1539,6 @@ export default { duration: 3000 }) this.searchLeftTable() - this.increment入库单号Seq() this.dialogFormVisible4 = false } else { this.$message.error('通知失败') diff --git a/src/views/PurchasingManagement/PurchaseOrder/index.vue b/src/views/PurchasingManagement/PurchaseOrder/index.vue index 0b7751f7..e6bcacaf 100644 --- a/src/views/PurchasingManagement/PurchaseOrder/index.vue +++ b/src/views/PurchasingManagement/PurchaseOrder/index.vue @@ -1302,10 +1302,15 @@ export default { now.getSeconds().toString().padStart(2, '0') + now.getMilliseconds().toString().padStart(3, '0') const suffix = file.name.split('.').pop() || 'jpg' - const savePath = MESUploadFileNew_BasePath + '\\OrderInquiry\\' + timestamp + '-' + this.purchaseContractID + '.' + suffix + const lastDotIndex = file.name.lastIndexOf('.') + const fileName = lastDotIndex > -1 ? file.name.slice(0, lastDotIndex) : file.name + const sqlFileName = fileName.replace(/'/g, "''") + const sqlSuffix = suffix.replace(/'/g, "''") + const uniqueCode = Math.random().toString(36).slice(2, 8) + const savePath = MESUploadFileNew_BasePath + '\\OrderInquiry\\' + timestamp + '-' + this.purchaseContractID + '-' + uniqueCode + '.' + suffix // 构造SQL语句 - const sqlStatement = `update 采购管理_采购合同查询_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 采购管理_采购合同查询_图片 where 采购合同流水号 = ${this.purchaseContractID} order by 操作时间 desc)` + const sqlStatement = `update 采购管理_采购合同查询_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 采购管理_采购合同查询_图片 where 采购合同流水号 = ${this.purchaseContractID} and 文件名称 = N'${sqlFileName}' and 文件后缀 = N'${sqlSuffix}' and 文件路径 is null order by 操作时间 desc, id desc); IF @@ROWCOUNT <> 1 RAISERROR(N'图片路径回填失败', 16, 1)` // 调用新接口保存文件 const formData = new FormData() diff --git a/src/views/SalesManagement/DeliveryRecord/index.vue b/src/views/SalesManagement/DeliveryRecord/index.vue index 0a167873..892d8c69 100644 --- a/src/views/SalesManagement/DeliveryRecord/index.vue +++ b/src/views/SalesManagement/DeliveryRecord/index.vue @@ -297,10 +297,15 @@ export default { now.getSeconds().toString().padStart(2, '0') + now.getMilliseconds().toString().padStart(3, '0') const suffix = file.name.split('.').pop() || 'jpg' - const savePath = MESUploadFileNew_BasePath + '\\DeliveryRecord\\' + timestamp + '-' + this.listValue + '.' + suffix + const lastDotIndex = file.name.lastIndexOf('.') + const fileName = lastDotIndex > -1 ? file.name.slice(0, lastDotIndex) : file.name + const sqlFileName = fileName.replace(/'/g, "''") + const sqlSuffix = suffix.replace(/'/g, "''") + const uniqueCode = Math.random().toString(36).slice(2, 8) + const savePath = MESUploadFileNew_BasePath + '\\DeliveryRecord\\' + timestamp + '-' + this.listValue + '-' + uniqueCode + '.' + suffix // 构造SQL语句：清空文件内容，更新文件路径 - const sqlStatement = `update 发货管理_发货单_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 发货管理_发货单_图片 where 发货单流水号 = ${this.listValue} order by 操作时间 desc)` + const sqlStatement = `update 发货管理_发货单_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 发货管理_发货单_图片 where 发货单流水号 = ${this.listValue} and 文件名称 = N'${sqlFileName}' and 文件后缀 = N'${sqlSuffix}' and 文件路径 is null order by 操作时间 desc, id desc); IF @@ROWCOUNT <> 1 RAISERROR(N'图片路径回填失败', 16, 1)` // 调用新接口保存文件到磁盘 const formData = new FormData() @@ -563,4 +568,3 @@ export default { width: 50px!important; } - diff --git a/src/views/SalesManagement/ProductDelivery/index.vue b/src/views/SalesManagement/ProductDelivery/index.vue index 62e9fcd2..8a003bfc 100644 --- a/src/views/SalesManagement/ProductDelivery/index.vue +++ b/src/views/SalesManagement/ProductDelivery/index.vue @@ -1280,10 +1280,15 @@ export default { now.getSeconds().toString().padStart(2, '0') + now.getMilliseconds().toString().padStart(3, '0') const suffix = file.name.split('.').pop() || 'jpg' - const savePath = MESUploadFileNew_BasePath + '\\DeliveryRecord\\' + timestamp + '-' + this.listValue + '.' + suffix + const lastDotIndex = file.name.lastIndexOf('.') + const fileName = lastDotIndex > -1 ? file.name.slice(0, lastDotIndex) : file.name + const sqlFileName = fileName.replace(/'/g, "''") + const sqlSuffix = suffix.replace(/'/g, "''") + const uniqueCode = Math.random().toString(36).slice(2, 8) + const savePath = MESUploadFileNew_BasePath + '\\DeliveryRecord\\' + timestamp + '-' + this.listValue + '-' + uniqueCode + '.' + suffix // 构造SQL语句：清空文件内容，更新文件路径 - const sqlStatement = `update 发货管理_发货单_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 发货管理_发货单_图片 where 发货单流水号 = ${this.listValue} order by 操作时间 desc)` + const sqlStatement = `update 发货管理_发货单_图片 set 文件内容 = NULL, 文件路径 = N'${savePath}' where id = (select top 1 id from 发货管理_发货单_图片 where 发货单流水号 = ${this.listValue} and 文件名称 = N'${sqlFileName}' and 文件后缀 = N'${sqlSuffix}' and 文件路径 is null order by 操作时间 desc, id desc); IF @@ROWCOUNT <> 1 RAISERROR(N'图片路径回填失败', 16, 1)` // 调用新接口保存文件到磁盘 const formData = new FormData() diff --git a/src/views/SeikoWorkshop/WorkshopAssignment/index.vue b/src/views/SeikoWorkshop/WorkshopAssignment/index.vue index 49a9416d..097533d1 100644 --- a/src/views/SeikoWorkshop/WorkshopAssignment/index.vue +++ b/src/views/SeikoWorkshop/WorkshopAssignment/index.vue @@ -957,6 +957,7 @@ export default { param[1] = ['数量', row.数量] param[2] = ['工艺任务流水号', row.工艺任务流水号] param[3] = ['退货人', this.id] + param[4] = ['订单流水号', row.订单流水号] // 参数数量与名称要与存储过程对应 var Data = this.CreateData('12', '车间生产管理工艺_零件工序_取消派工', param) this.ExecDatabase(Data).then(response => { diff --git a/src/views/TechnologyCenter/MaterialMaintain/index.vue b/src/views/TechnologyCenter/MaterialMaintain/index.vue index 2adab4d8..39dfdfcf 100644 --- a/src/views/TechnologyCenter/MaterialMaintain/index.vue +++ b/src/views/TechnologyCenter/MaterialMaintain/index.vue @@ -37,9 +37,9 @@ style="margin-left:10px" @click="pageCurrent=1;searchTable()">查询 - + 采购变更申请 @@ -209,6 +209,7 @@ style="margin-right: 10px" @click="handleEdit(scope.row)"/> + + + + + + + + +
取消 @@ -719,6 +729,9 @@ export default { 类型: '', 物料库: '', 物料说明: '', + 安全库存: '', + 最高库存: '', + 最低库存: '', 原图号或型号: '', 原物料名称: '' }, @@ -1262,6 +1275,9 @@ export default { this.form.单位 = Number(row.单位流水号) this.form.类型 = Number(row.类型) this.form.物料库 = Number(row.物料库流水号) + this.form.安全库存 = row.安全库存 || '' + this.form.最高库存 = row.最高库存 || '' + this.form.最低库存 = row.最低库存 || '' this.materialValue = row.物料流水号 this.dialogFormVisible = true }, @@ -1281,6 +1297,9 @@ export default { param1[8] = ['货位流水号', this.form.库位] param1[9] = ['物料库流水号', this.form.物料库] param1[10] = ['物料说明', this.form.物料说明] + param1[11] = ['安全库存', this.form.安全库存] + param1[12] = ['最高库存', this.form.最高库存] + param1[13] = ['最低库存', this.form.最低库存] var Data1 = this.CreateData('12', '物料管理_编辑', param1) this.ExecDatabase(Data1).then(response => { if (response.data[0].result === '1') { @@ -1310,6 +1329,9 @@ export default { param[7] = ['物料编码', this.form.物料编码] param[8] = ['货位流水号', this.form.库位] param[9] = ['物料库流水号', this.form.物料库] + param[10] = ['安全库存', this.form.安全库存] + param[11] = ['最高库存', this.form.最高库存] + param[12] = ['最低库存', this.form.最低库存] var Data = this.CreateData('12', '物料管理_编辑', param) this.ExecDatabase(Data).then(response => { if (response.data[0].result === '1') { diff --git a/src/views/TestPage/ImageSave.vue b/src/views/TestPage/ImageSave.vue index 5cf8bcff..51ffab87 100644 --- a/src/views/TestPage/ImageSave.vue +++ b/src/views/TestPage/ImageSave.vue @@ -230,7 +230,7 @@ export default { // 查询一批待迁移的数据（只查询必要字段，不查询文件内容以节省内存） const sql = `SELECT TOP ${this.config.batchSize} id, [${this.config.keyField}], 文件后缀 FROM [dbo].[${this.config.tableName}] WITH(NOLOCK) - WHERE 文件路径 IS NULL + WHERE 文件路径 IS NULL AND id > ${this.currentOffset} ORDER BY id` const Data = this.CreateData('3', sql) const response = await this.ExecDatabase(Data) @@ -247,6 +247,7 @@ export default { // 逐条处理 for (const record of records) { if (this.stopFlag) break + this.currentOffset = Math.max(this.currentOffset, record.id) await this.migrateOne(record) } } catch (err) { @@ -285,7 +286,7 @@ export default { now.getSeconds().toString().padStart(2, '0') + now.getMilliseconds().toString().padStart(3, '0') - const savePath = this.config.basePath + '\\\\' + this.config.moduleName + '\\\\' + timestamp + '-' + keyValue + '.' + suffix + const savePath = this.config.basePath + '\\\\' + this.config.moduleName + '\\\\' + timestamp + '-' + keyValue + '-' + id + '.' + suffix // 3. 将base64转为Blob const byteCharacters = atob(fileContent) @@ -297,7 +298,7 @@ export default { const blob = new Blob([byteArray], { type: 'image/' + suffix }) // 4. 构造SQL语句（只更新路径，不清空内容） - const updateSql = `UPDATE [dbo].[${this.config.tableName}] SET 文件路径 = N'${savePath}' WHERE id = ${id}` + const updateSql = `UPDATE [dbo].[${this.config.tableName}] SET 文件路径 = N'${savePath}' WHERE id = ${id}; IF @@ROWCOUNT <> 1 RAISERROR(N'图片路径回填失败', 16, 1)` // 5. 调用接口保存文件 const formData = new FormData() diff --git a/src/views/WarehouseManagement/PurchasePartsStorage/index.vue b/src/views/WarehouseManagement/PurchasePartsStorage/index.vue index 958d2e3c..a09e3341 100644 --- a/src/views/WarehouseManagement/PurchasePartsStorage/index.vue +++ b/src/views/WarehouseManagement/PurchasePartsStorage/index.vue @@ -5,7 +5,7 @@ v-model="PartType" type="border-card" style="height: 850px;padding: 0" - @tab-click="pageCurrent=1;pageCurrent1=1;getData()"> + @tab-click="pageCurrent=1;pageCurrent1=1">
+ @change="handleSupplierChange"> 入库 - + 入库单 + - + @@ -150,6 +163,7 @@ @@ -271,9 +285,7 @@ v-loading="loading" ref="table2" :data="tableData3" - :summary-method="getSummaries1" highlight-current-row - show-summary border stripe size="small" @@ -313,9 +325,16 @@ {{ scope.row.零件图号 }} - + - + @@ -443,8 +463,6 @@
- + @@ -706,7 +724,22 @@ export default { ...mapGetters([ 'id', 'token' - ]) + ]), + tableDataRKDMerged() { + var map = {} + var result = [] + for (var i = 0; i < this.tableDataRKD.length; i++) { + var row = this.tableDataRKD[i] + var key = row.入库单号 + if (map[key] !== undefined) { + result[map[key]].到货数 = Number(result[map[key]].到货数 || 0) + Number(row.到货数 || 0) + } else { + map[key] = result.length + result.push(Object.assign({}, row, { 到货数: Number(row.到货数 || 0) })) + } + } + return result + } }, updated() { if (this.$refs['']) { @@ -735,18 +768,39 @@ export default { this.tableDataRKD = response.data.filter(item => item.是否入库 === 0 || item.是否入库 === false) }) }, + handleSupplierChange() { + this.contractStateValue = '' + this.contractNumber = '' + this.contractState = [] + if (!this.supplierSelectionValue) { + this.supplierSelectionName = '' + this.tableData1 = [] + this.multipleSelection = [] + this.returns = [] + this.totalAmount = '' + this.$nextTick(() => { + if (this.$refs.table) { + this.$refs.table.clearSelection() + } + }) + return + } + this.getContractState() + this.searchTable1() + this.onChangeSupplierSelection() + }, onChangeSupplierSelection() { let obj = {} obj = this.supplierSelection.find((item) => { return item.value === this.supplierSelectionValue }) - this.supplierSelectionName = obj.label + this.supplierSelectionName = obj ? obj.label : '' }, showRKDDialog() { var param = [] var Data = this.CreateData('11', '仓储管理_入库单_查询', param) this.ExecDatabase(Data).then(response => { - this.tableDataRKD = response.data.filter(item => item.是否入库 === 0 || item.是否入库 === false) + this.tableDataRKD = response.data.filter(item => item.是否入库 === 0 || item.是否入库 === false ) this.dialogFormVisibleRKD = true }) }, @@ -998,11 +1052,17 @@ export default { for (let i = 0; i < response.data.length; i++) { this.locateName.push({ label: response.data[i].货位名称, - value: response.data[i].货位流水号 + value: String(response.data[i].货位流水号) }) } }) }, + onLocateChange(row) { + var obj = this.locateName.find(function(item) { + return item.value === row.货位流水号 + }) + row.货位名称 = obj ? obj.label : '' + }, getData() { if (this.PartType === '采购入库') { this.searchTable1() @@ -1027,6 +1087,18 @@ export default { }) }, searchTable1() { + if (!this.supplierSelectionValue) { + this.tableData1 = [] + this.multipleSelection = [] + this.returns = [] + this.totalAmount = '' + this.$nextTick(() => { + if (this.$refs.table) { + this.$refs.table.clearSelection() + } + }) + return + } for (let i = 0; i < this.contractState.length; i++) { if (this.contractStateValue === this.contractState[i].value) { this.contractNumber = this.contractState[i].label @@ -1042,23 +1114,35 @@ export default { this.ExecDatabase(Data).then(response => { this.tableData1 = response.data console.log('采购件入库', response.data) + for (let i = 0; i < this.tableData1.length; i++) { + var row = this.tableData1[i] + if (row.货位流水号 !== null && row.货位流水号 !== undefined && row.货位流水号 !== '') { + row.货位流水号 = String(row.货位流水号) + } + this.$set(row, '_editing', false) + } if (this.tableData1.length === 0) { - this.getContractState() this.getSummaries() - } else { - this.$nextTick(function() { - this.tableData1.forEach(function(row) { - if (Number(row.等待入库数量) > 0) { - this.$refs.table.toggleRowSelection(row, true) - } - }.bind(this)) - }.bind(this)) } }) }, selectable(row) { return (Number(row.采购数) !== Number(row.已到数)) && Number(row.本次到货数) !== 0 }, + selectInStockableRows() { + if (!this.$refs.table) return + this.$refs.table.clearSelection() + this.$nextTick(function() { + this.tableData1.forEach(function(row) { + if ((Number(row.采购数) !== Number(row.已到数)) && Number(row.本次到货数) !== 0) { + this.$refs.table.toggleRowSelection(row, true) + } + }.bind(this)) + }.bind(this)) + }, + toggleRowEdit(row) { + this.$set(row, '_editing', !row._editing) + }, submitInStorage() { // this.exportTable() if (!this.multipleSelection || this.multipleSelection.length === 0) { @@ -1087,7 +1171,7 @@ export default { this.multipleSelection_variable = this.multipleSelection this.multipleSelection = [] for (let i = 0; i < this.multipleSelection_variable.length; i++) { - if (this.multipleSelection_variable[i].货位流水号 === 0) { + if (!this.multipleSelection_variable[i].货位流水号 && this.multipleSelection_variable[i].货位流水号 !== 0) { this.$message.warning('存在未绑定货位的物料') return } @@ -1196,6 +1280,13 @@ export default { this.ExecDatabase(Data).then(response => { this.tableData3 = response.data.rows this.total1 = response.data.total + for (let i = 0; i < this.tableData3.length; i++) { + var row = this.tableData3[i] + if (row.货位流水号 !== null && row.货位流水号 !== undefined && row.货位流水号 !== '') { + row.货位流水号 = String(row.货位流水号) + } + this.$set(row, '_editing', false) + } }) }, selectable2(row) { @@ -1216,7 +1307,7 @@ export default { this.multipleSelection_variable2 = this.multipleSelection2 this.multipleSelection2 = [] for (let i = 0; i < this.multipleSelection_variable2.length; i++) { - if (this.multipleSelection_variable2[i].货位流水号 === 0) { + if (!this.multipleSelection_variable2[i].货位流水号 && this.multipleSelection_variable2[i].货位流水号 !== 0) { this.$message.warning('存在未绑定货位的物料') return } diff --git a/src/views/WarehouseManagement/WarehouseSummary/index.vue b/src/views/WarehouseManagement/WarehouseSummary/index.vue index 6dc51d9a..752d05a1 100644 --- a/src/views/WarehouseManagement/WarehouseSummary/index.vue +++ b/src/views/WarehouseManagement/WarehouseSummary/index.vue @@ -67,34 +67,62 @@

{{ currentDetail }}详情

导出
- - -