diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js
index 00b9e3ad..3db420b9 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusNew.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js
@@ -110,3 +110,22 @@ export function submitEdit(Number1, completetime, processSerialNumber) {
}
})
}
+export function getExport(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '3',
+ name: `select s1.* from (
+ select a1.*, row_number() over (partition by 工艺计划流水号 order
+
+ by 工序顺序) as group_idx
+
+from (select TOP 100 PERCENT 零件图号,工艺计划流水号,机床流水号,工序顺序,工艺名称,材料,零件名称,投产数量,组号,机床图号 from dbo.车间生产管理工艺_零件工序_视图
+where 考核状态 =6 and 机床流水号 = ${num} and 工艺编号 is not null and 完成日期 is null
+group by 零件图号,工艺计划流水号,考核状态,机床流水号,工艺名称,工序顺序,材料,零件名称,投产数量,组号,机床图号
+order by 工艺计划流水号,工序顺序) as a1 ) s1
+where s1.group_idx= 1`
+ }
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 38f59628..da1b48bb 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http:/192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
+export const url = `http://192.168.0.107:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.0.107:8079/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
@@ -26,7 +26,8 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+
+ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 2317f21a..1274075e 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -173,7 +173,7 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
- label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购'),
+ label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购')),
value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态,
diff --git a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue b/src/views/ManufacturingCenter/OnlineProcessChange/index.vue
index fbd89af4..fc6d4559 100644
--- a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue
+++ b/src/views/ManufacturingCenter/OnlineProcessChange/index.vue
@@ -506,7 +506,6 @@ import {
readyChange,
TableAddLi1,
TableAddLi,
- getPartnames3,
getPartnames4,
modifyRemark,
detailInfo
@@ -1109,38 +1108,21 @@ export default {
searchPartsByMachineGroup() {
this.tableData = []
this.partNum = []
- if (this.radio === 1) { // 未编制
- this.disabled = false
- this.isShow1 = true
- this.isShow2 = false
- this.checked1 = true
- getPartnames3(this.machine_Group_part).then(response => {
- for (let i = 0; i < response.data.length; i++) {
- this.partNum.push({
- label: response.data[i].零件图号,
- value: response.data[i].工艺计划流水号,
- machine: response.data[i].机床图号,
- group: response.data[i].组号
- })
- }
- })
- } else { // 已编制
- this.isShow = true
- this.isShow1 = false
- this.isShow2 = true
- this.disabled = true
- this.checked1 = false
- getPartnames4(this.machine_Group_part).then(response => {
- for (let i = 0; i < response.data.length; i++) {
- this.partNum.push({
- label: response.data[i].零件图号,
- value: response.data[i].工艺计划流水号,
- machine: response.data[i].机床图号,
- group: response.data[i].组号
- })
- }
- })
- }
+ this.isShow = true
+ this.isShow1 = false
+ this.isShow2 = true
+ this.disabled = true
+ this.checked1 = false
+ getPartnames4(this.machine_Group_part).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ this.partNum.push({
+ label: response.data[i].零件图号,
+ value: response.data[i].工艺计划流水号,
+ machine: response.data[i].机床图号,
+ group: response.data[i].组号
+ })
+ }
+ })
},
searchParts() { // 根据条件查零件号
this.tableData = []
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 446d7eca..0e26c366 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -21,9 +21,10 @@
查询
+ 导出
-
+
-
+
{{ scope.row.工艺名称 }}
@@ -56,11 +57,11 @@
{{ scope.row.操作者 }}
-
-
- {{ scope.row.排产日期 }}
-
-
+
+
+
+
+
{{ scope.row.完成日期 }}
@@ -69,7 +70,7 @@
-
+
-
+
-
-
-
-
-
- {{ scope.row.跟单号 }}
+
+
+
+
+
+
{{ scope.row.零件图号 }}
@@ -210,7 +211,7 @@