diff --git a/src/icons/svg/VariableDeviceType.svg b/src/icons/svg/VariableDeviceType.svg new file mode 100644 index 0000000..849675a --- /dev/null +++ b/src/icons/svg/VariableDeviceType.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/views/BasicData/DistributionStation/index.vue b/src/views/BasicData/DistributionStation/index.vue index 668de45..1aa5a56 100644 --- a/src/views/BasicData/DistributionStation/index.vue +++ b/src/views/BasicData/DistributionStation/index.vue @@ -12,7 +12,12 @@ size="mini"/>
- +
@@ -45,7 +50,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.people.push({ label: response.data[i].姓名, - value: response.data[i].考勤编号 + value: response.data[i].人员编号 }) } }) @@ -97,6 +102,22 @@ export default { } } }) + }, + distributionStation(value, direction, keyArr) { + // let followsArr = [] + // value为左/右的所有数值，direction为方向left or right，keyArr为选中的key + switch (direction) { + // 右到左 绑定 + case 'left': + console.log(value, keyArr) + // 调用后端api绑定接口 + break + // 从左到右 解绑 + case 'right': + console.log(value, keyArr) + // 调用后端api解绑接口 + break + } } } } diff --git a/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue b/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue index 7cac3f3..c5ba1ab 100644 --- a/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue +++ b/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue @@ -63,7 +63,13 @@ - + + + { + for (let i = 0; i < response.data.length; i++) { + this.PLCIP.push({ + label: response.data[i].设备IP, + value: response.data[i].设备IP, + value1: response.data[i].ID + }) + } + }) + }, changeName(val) { for (let i = 0; i < this.dataType.length; i++) { if (this.dataType[i].value === val) { @@ -296,7 +323,7 @@ export default { if (this.$refs['form'] !== undefined) { this.$refs['form'].resetFields() } - this.form.IP = row.IP + this.form.PLCIP = row.PLC this.form.numberAlarms = row.报警数 this.form.massNumber = row.质量组数 this.form.stationNo = row.工位号 @@ -308,7 +335,7 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { var param = [] - param[0] = ['IP', this.form.IP] + param[0] = ['IP', this.form.PLCIP] param[1] = ['工位号', this.form.stationNo] param[2] = ['工位代码', this.form.fourNumber] param[3] = ['报警数', this.form.numberAlarms] diff --git a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue index 46c008e..2ce9890 100644 --- a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue +++ b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue @@ -527,7 +527,13 @@ - + + + @@ -765,6 +771,7 @@ export default { unSpecification: [], dataTypeValue: '', dataType: [], + PLCIP: [], tableData: [], activeValue: '', active: [{ @@ -865,6 +872,7 @@ export default { } }, created() { + this.getIP() this.getNumber() this.searchTable() }, @@ -896,6 +904,25 @@ export default { } }) }, + getIP() { + this.PLCIP = [] + request({ + url: '', + method: 'post', + data: { + type: '3', + name: `SELECT [设备IP],[ID] FROM [dbo].[MES_基本变量设备类型对应表] ORDER BY ID` + } + }).then(response => { + for (let i = 0; i < response.data.length; i++) { + this.PLCIP.push({ + label: response.data[i].设备IP, + value: response.data[i].设备IP, + value1: response.data[i].ID + }) + } + }) + }, changeName(val) { for (let i = 0; i < this.dataType.length; i++) { if (this.dataType[i].value === val) { diff --git a/src/views/BasicDataMaintenance/VariableDeviceType/index.vue b/src/views/BasicDataMaintenance/VariableDeviceType/index.vue new file mode 100644 index 0000000..3c07dc9 --- /dev/null +++ b/src/views/BasicDataMaintenance/VariableDeviceType/index.vue @@ -0,0 +1,327 @@ + + + + + + diff --git a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue index 3dffe6f..695ddb7 100644 --- a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue +++ b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue @@ -3,7 +3,7 @@
工位号： - + 工位名称： 产品型号： - + 查询物料 创建物料 + 复制物料 物料导入 物料导出
@@ -38,7 +39,8 @@ element-loading-background="rgba(0, 0, 0, 0.2)" class="main" tooltip-effect="dark" - style="width: 100%;max-height: 700px" + height="740px" + style="width: 100%" border size="mini" @selection-change="handleSelectionChange"> @@ -48,6 +50,11 @@ {{ scope.row.物料号 }} + + + @@ -283,6 +317,7 @@ export default { method2Explain: '', // 机床2加工方式说明 stockQuantity: '', // 库存数量 stockNum: '', // 库位号 + dialogFormVisible4: false, explain: false, orderNumber: [], orderNumberValue: '', @@ -334,6 +369,7 @@ export default { }, form1: { // 修改订单 partName: '', + stationNumberValue: '', orderNumber: '', partDrawing: '', number: '', @@ -349,6 +385,7 @@ export default { number: [{ required: true, message: '请输入数量', trigger: 'blur' }], manufactor: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }], verificationValue: [{ required: true, message: '请选择是否验证', trigger: 'change' }], + stationNumberValue: [{ required: true, message: '请选择', trigger: 'change' }], mainMaterialValue: [{ required: true, message: '请选择是否主物料', trigger: 'change' }] }, form2: { // 订单下发 @@ -358,11 +395,11 @@ export default { MID: '', IssuedQuantity: 1 }, - rules2: { // 订单下发验证 - planQuantity: [{ required: true, message: '请输入计划数量', trigger: 'blur' }], - orderNumber: [{ required: true, message: '请输入订单号', trigger: 'blur' }], - engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }], - IssuedQuantity: [{ required: true, message: '请输入订单下发数量', trigger: 'blur' }] + form4: { + engineTypeValue: '' + }, + rules4: { // 订单下发验证 + engineTypeValue: [{ required: true, message: '请选择机型', trigger: 'blur' }] }, // planTime: [new Date(new Date().getTime() - 3600 * 1000 * 24 * 3000), new Date(new Date().getTime())], planTime: [], @@ -374,8 +411,8 @@ export default { states: '', // 当前库存状态 MIDGroup: [], total: 0, // 总条数 - pageList: 15, // 每页显示条数 - pageSize: 15, // 每页显示条数 + pageList: 30, // 每页显示条数 + pageSize: 30, // 每页显示条数 pageCurrent: 1, // 后台获取页 loading: false } @@ -396,7 +433,6 @@ export default { created() { this.getStationNumber() this.getEndStation() - this.searchOrder() }, methods: { removeAll() { @@ -442,6 +478,8 @@ export default { value: response.data[i].发动机型号 }) } + }).then(() => { + this.searchOrder() }) }, // 初始化获取订单号 @@ -450,10 +488,10 @@ export default { var param = [] var Data = this.CreateData('11', 'MES_计划BOM_工位与名称_查询', param) this.ExecDatabase(Data).then(response => { - if (response.data.length) { - this.stationNumberValue = response.data[0].工位号 - this.stationName = response.data[0].工序名称 - } + // if (response.data.length) { + // this.stationNumberValue = response.data[0].工位号 + // this.stationName = response.data[0].工序名称 + // } for (let i = 0; i < response.data.length; i++) { this.stationNumber.push({ label: response.data[i].工位号, @@ -469,11 +507,12 @@ export default { var param = [] param[0] = ['工位号', this.stationNumberValue] param[1] = ['发动机型号', this.engineTypeValue] - var Data = this.CreateData('11', '电子看板_装配零件_查询', param) + var Data = this.CreateData('11', '电子看板_装配零件_查询', param, this.pageSize, this.pageCurrent) this.ExecDatabase(Data).then(response => { console.log(response, 66) if (response.data.length !== 0) { - this.tableData = response.data + this.tableData = response.data.rows + this.total = response.data.total } }) }, @@ -503,7 +542,6 @@ export default { param[2] = ['物料号', this.form.orderNumber] param[3] = ['零件名称', this.form.partName] param[4] = ['零件图号', this.form.partDrawing] - // param[5] = ['完成数量', this.form.quantityCompletion] param[5] = ['生产厂家', this.form.manufactor] param[6] = ['是否验证', this.form.verificationValue] param[7] = ['是否主物料', this.form.mainMaterialValue] @@ -532,6 +570,68 @@ export default { this.dialogFormVisible = false this.$refs[formName].resetFields() }, + copyOrder(formName) { + if (this.tableData.length) { + if (this.$refs[formName] !== undefined) { + this.$refs[formName].resetFields() + } + this.dialogFormVisible4 = true + } else { + this.$message({ + message: '暂无可复制的数据！', + type: 'error' + }) + } + }, + callOff4() { + this.dialogFormVisible4 = false + }, + async submitAdd4() { + let stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number + for (let i = 0; i < this.tableData.length; i++) { + stationNumberValue = this.tableData[i].工位号 + orderNumber = this.tableData[i].物料号 + partName = this.tableData[i].零件名称 + partDrawing = this.tableData[i].零件图号 + manufactor = this.tableData[i].生产厂家 + verificationValue = this.tableData[i].是否验证 + mainMaterialValue = this.tableData[i].是否主物料 + number = this.tableData[i].零件数量 + await this.submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number) + } + this.$message({ + message: '增加成功', + type: 'success' + }) + this.dialogFormVisible4 = false + this.engineTypeValue = this.form4.engineTypeValue + this.searchOrder() + }, + async submitAdd5(stationNumberValue, orderNumber, partName, partDrawing, manufactor, verificationValue, mainMaterialValue, number) { + var param = [] + param[0] = ['工位号', stationNumberValue] + param[1] = ['发动机型号', this.form4.engineTypeValue] + param[2] = ['物料号', orderNumber] + param[3] = ['零件名称', partName] + param[4] = ['零件图号', partDrawing] + param[5] = ['生产厂家', manufactor] + param[6] = ['是否验证', verificationValue] + param[7] = ['是否主物料', mainMaterialValue] + param[8] = ['零件数量', number] + console.log(param, 'param') + var Data = this.CreateData('12', '电子看板_装配零件_SPC_增加', param) + return new Promise((resolve, reject) => { + this.ExecDatabase(Data).then(response => { + if (response.data[0].result === '1') { + console.log('1') + resolve(1) + } else { + console.log('0') + reject(2) + } + }) + }) + }, // 导入订单 importOrder() { this.dialogFormVisible3 = true @@ -548,7 +648,7 @@ export default { method: 'post', data: { type: '4', - name: `delete from 电子看板_装配零件 where id = ${row.ID}` + name: `delete from 电子看板_装配零件 where ID = ${row.id}` } }).then(response => { if (response.data[0].result === '1') { @@ -572,13 +672,14 @@ export default { } console.log(row.排序) this.form1.partName = row.零件名称 + this.form1.stationNumberValue = row.工位号 this.form1.orderNumber = row.物料号 this.form1.partDrawing = row.零件图号 this.form1.number = row.零件数量 this.form1.manufactor = row.生产厂家 this.form1.verificationValue = Number(row.是否验证) this.form1.mainMaterialValue = Number(row.是否主物料) - this.form1.ID = row.ID + this.form1.ID = row.id this.dialogFormVisible1 = true }, // 提交修改订单 @@ -595,7 +696,7 @@ export default { param[5] = ['是否验证', this.form1.verificationValue] param[6] = ['是否主物料', this.form1.mainMaterialValue] param[7] = ['零件数量', this.form1.number] - param[8] = ['工位号', this.stationNumberValue] + param[8] = ['工位号', this.form1.stationNumberValue] param[9] = ['发动机型号', this.engineTypeValue] var Data = this.CreateData('12', '电子看板_装配零件_SPC_修改', param) this.ExecDatabase(Data).then(response => { @@ -692,63 +793,62 @@ export default { verificationValue, mainMaterialValue, isPreservation - var param = [] - param[0] = ['物料号', this.worksheet[j].L2.v] - console.log('物料号', this.worksheet[j].L2.v) - var Data = this.CreateData('11', '电子看板_装配零件_总物料表_导入校验', param) - const response = await this.ExecDatabase(Data) - const res = response.data - if (res[0].Column1 !== 0) { - this.$notify.error(`${this.worksheet[j].C2.v}已经存在，请确认文件是否正确`) - this.loading = false - this.disabled = false - return - } else { - for (let i = 0; i < 999; i++) { - const attr = i + 2 - stationNumberValue = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : '' - engineTypeNumber = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' - partDrawing = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : '' - partName = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' - number = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : '' - partBatchNumber = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : '' - manufactor = this.worksheet[j][`G${attr}`] ? this.worksheet[j][`G${attr}`].v : '' - engineTypeValue = this.worksheet[j][`H${attr}`] ? this.worksheet[j][`H${attr}`].v : '' - verificationValue = this.worksheet[j][`I${attr}`] ? this.worksheet[j][`I${attr}`].v : '' - mainMaterialValue = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : '' - isPreservation = this.worksheet[j][`K${attr}`] ? this.worksheet[j][`K${attr}`].v : '' - orderNumber = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : '' - if (!stationNumberValue && !engineTypeNumber && + // var param = [] + // param[0] = ['物料号', this.worksheet[j].L2.v] + // console.log('物料号', this.worksheet[j].L2.v) + // var Data = this.CreateData('11', '电子看板_装配零件_总物料表_导入校验', param) + // const response = await this.ExecDatabase(Data) + // const res = response.data + // if (res[0].Column1 !== 0) { + // this.$notify.error(`${this.worksheet[j].L2.v}已经存在，请确认文件是否正确`) + // this.loading = false + // this.disabled = false + // return + // } + for (let i = 0; i < 999; i++) { + const attr = i + 2 + stationNumberValue = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : '' + engineTypeNumber = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' + partDrawing = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : '' + partName = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' + number = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : '' + partBatchNumber = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : '' + manufactor = this.worksheet[j][`G${attr}`] ? this.worksheet[j][`G${attr}`].v : '' + engineTypeValue = this.worksheet[j][`H${attr}`] ? this.worksheet[j][`H${attr}`].v : '' + verificationValue = this.worksheet[j][`I${attr}`] ? this.worksheet[j][`I${attr}`].v : '' + mainMaterialValue = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : '' + isPreservation = this.worksheet[j][`K${attr}`] ? this.worksheet[j][`K${attr}`].v : '' + orderNumber = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : '' + if (!stationNumberValue && !engineTypeNumber && !partDrawing && !partName && !number && !partBatchNumber && !manufactor && !engineTypeValue && !verificationValue && !mainMaterialValue && !isPreservation && !orderNumber) { - break - } else if (!orderNumber) { // 名称不能为空 - this.$notify.error(`物料号不能为空`) - break - } else if (Number(partDrawing) <= 0) { // 数量不能为0 - this.$notify.error(`零件图号不能为空`) - break + break + } else if (!orderNumber) { // 名称不能为空 + this.$notify.error(`物料号不能为空`) + break + } else if (Number(partDrawing) <= 0) { // 数量不能为0 + this.$notify.error(`零件图号不能为空`) + break + } else { + if (orderNumber) { + await sleep(50) + await this.insertToSQL(stationNumberValue, + engineTypeNumber, + partDrawing, + partName, + number, + partBatchNumber, + manufactor, + engineTypeValue, + verificationValue, + mainMaterialValue, + isPreservation, + orderNumber) } else { - if (orderNumber) { - await sleep(50) - await this.insertToSQL(stationNumberValue, - engineTypeNumber, - partDrawing, - partName, - number, - partBatchNumber, - manufactor, - engineTypeValue, - verificationValue, - mainMaterialValue, - isPreservation, - orderNumber) - } else { - this.loading = false - this.disabled = false - this.$notify.error(`请确认导入文件是否正确`) - return - } + this.loading = false + this.disabled = false + this.$notify.error(`请确认导入文件是否正确`) + return } } } @@ -791,21 +891,13 @@ export default { param[9] = ['是否主物料', mainMaterialValue] param[10] = ['是否保存', isPreservation] param[11] = ['物料号', orderNumber] - param[12] = ['导入类型', '1', 'int', '1'] var Data = this.CreateData('12', '物料数据_导入Excel', param) const response = await this.ExecDatabase(Data) const res = response.data - if (res.hasOwnProperty('output') === false) { - if (res[0].result === '0') { - this.$notify.error(`${orderNumber}导入失败`) - } + if (res[0].result === '0') { + this.$notify.error(`${orderNumber}导入失败`) } else { - if (res.result[0].result === '0') { - this.$notify.error(`${orderNumber}导入失败`) - } - if (res.output[0].导入类型 === '2') { - this.$notify.warning(`${orderNumber}存在重复数据`) - } + this.$notify.error(`${orderNumber}导入成功`) } } catch (e) { this.err++ diff --git a/src/views/RecipeManagement/RecipeManagement/index.vue b/src/views/RecipeManagement/RecipeManagement/index.vue new file mode 100644 index 0000000..63c03df --- /dev/null +++ b/src/views/RecipeManagement/RecipeManagement/index.vue @@ -0,0 +1,453 @@ + + + + + + diff --git a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue index 62f1475..f9abff3 100644 --- a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue +++ b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue @@ -490,7 +490,7 @@ export default { // param[6] = ['结果', '1111', 'int', '1'] var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单手动增加', param) this.ExecDatabase(Data).then(response => { - if (response.data.output[0].结果 === '1') { + if (response.data[0].result === '1') { this.$message({ message: '订单创建成功', type: 'success' @@ -498,7 +498,7 @@ export default { this.pageCurrent = 1 this.pageSize = 15 this.searchOrder() - } else if (response.data.output[0].结果 === '2') { + } else if (response.data[0].result.结果 === '2') { this.$message.error('订单重复，创建失败！') } else { this.$message.error('订单创建失败！') diff --git a/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue b/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue index 0917079..8efb4c0 100644 --- a/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue +++ b/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue @@ -118,7 +118,7 @@