meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict

Browse Source
This commit is contained in:
chenjianan
2019-06-14 08:18:40 +08:00
parent a374ea5c8d 8b9c1033da
commit a6082d08cc
22 changed files with 855 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/Assembly/QualityInspectionInformationInquiry.js
View File

@@ -34,7 +34,7 @@ export function searchgroup(num) {
}
})
}
// 组件查询
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, pageCurrent, pageSize) {
return request({
url: '',
@@ -48,4 +48,14 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
}
})
}
export function searchPic(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '质检管理_图片_查询数据',
param: '质检流水号=' + num
}
})
}

103
src/api/BasicData/PartsNumberMaintenance.js
View File

@@ -34,7 +34,42 @@ export function groupSelect(machineValue) {
}
})
}
export function searchTable5(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件和标准件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable6(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_基本件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function searchTable7(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件_临时表数据查询',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
return request({
url: '',
@@ -70,6 +105,61 @@ export function deleteBasicParts(basicNum) {
}
})
}
export function alldelete(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_删除数据_根据组件流水号',
param: `组件流水号=${basicNum}`
}
})
}
export function deleteBasicParts5(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_外购件和标准件_临时表_删除',
param: `id=${basicNum}`
}
})
}
export function alldeleteBasicParts5(project, machine, group) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_外购件和标准件_临时表_全部删除',
param: `项目=${project}&机床=${machine}&组号=${group}`
}
})
}
export function deleteBasicParts6(basicNum) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_临时表_删除',
param: `id=${basicNum}`
}
})
}
export function alldeleteBasicParts6(project, machine, group) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_基本件_临时表_全部删除',
param: `项目=${project}&机床=${machine}&组号=${group}`
}
})
}
export function deletePurchaseData(num) {
return request({
url: '',
@@ -81,6 +171,17 @@ export function deletePurchaseData(num) {
}
})
}
export function alldeleteWB(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_标准件和外购件_删除数据_根据组件流水号',
param: '组件流水号=' + num + '=int'
}
})
}
export function editPurchaseData(num, num1) {
return request({
url: '',

14
src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
View File

@@ -57,7 +57,7 @@ export function JurisdictionControl(num1, num2) {
}
})
}
// 所有工序
// 所有工序(原）
export function getTable2(stepNumber) {
return request({
url: '',
@@ -69,6 +69,18 @@ export function getTable2(stepNumber) {
}
})
}
// 所有工序(新)
export function getTable3(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_加工进度修改2_查询',
param: '工艺计划流水号=' + stepNumber
}
})
}
// 正在加工零件
export function searchParts(stepNumber) {
return request({

2
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -69,7 +69,7 @@ export function getExport(num) {
name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
from 车间生产管理工艺_零件工序_视图
where 完成日期_短 is null and 考核状态 = 6
where 完成日期_短 is null and 考核状态 = 6 or 考核状态 = 7
group by 工艺计划流水号) as 当前加工工序表
inner join 车间生产管理工艺_零件工艺计划 on 当前加工工序表.工艺计划流水号 = 车间生产管理工艺_零件工艺计划.工艺计划流水号
inner join 车间生产管理工艺_零件工序 on 当前加工工序表.工艺计划流水号 = 车间生产管理工艺_零件工序.工艺计划流水号 and 当前加工工序表.待加工工序顺序 = 车间生产管理工艺_零件工序.工序顺序

12
src/api/ManufacturingCenter/ProjectPlanningQuery.js
View File

@@ -47,3 +47,15 @@ export function searchtable2(machineValue, type) {
}
})
}
export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '项目计划管理_项目总计划_查询数据',
param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
Pagination: pageCurrent + '&' + pageSize
}
})
}

4
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -49,14 +49,14 @@ export function getprocedure(processPlan, single) {
})
}
// 外协厂家查询
export function searchManufactor(name) {
export function searchManufactor(check, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
}
})
}