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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
bryan sun
2019-11-30 14:42:27 +08:00
parent bc1a58aead c83101a1ab
commit add19d8335
9 changed files with 553 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/ManufacturingCenter/ProcessTaskAssignment.js
View File

@@ -122,14 +122,14 @@ export function save(num1, num2, num3) {
})
}
// 保存
export function save2(num1, num2, num3) {
export function save2(num1, num2, num3, num4) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_工艺任务分配_保存数据',
param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
type: '1',
name: '车间生产管理工艺_工艺任务分配_通用件自动编制工艺_循环执行',
param: '工艺计划流水号组=' + num1 + '&零件图号组=' + num2 + '&规格组=' + num3 + '&工艺员流水号组=' + num4
}
})
}

2
src/api/PurchasingCenter/CreatePurchaseContract.js
View File

@@ -19,7 +19,7 @@ export function initSupplier11(num) {
type: '3',
name: ` SELECT distinct 供应商流水号,供应商名称
FROM 采购管理_询价单_视图
where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
}
})
}

24
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -38,38 +38,38 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2
})
}
// 查询采购计划明细
export function searchMateriel(num, check, num1) {
export function searchMateriel(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_采购计划明细_查询数据_未选入',
param: `采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
param: `供应商=${num}`
}
})
}
// 查询离线采购计划明细
export function searchLxMateriel(num, check, num1) {
export function searchLxMateriel(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_离线采购计划明细_查询数据_未选入',
param: `离线采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
param: `供应商流水号=${num}`
}
})
}
// 查询到货单
export function searchArriveOrder(num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) {
export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_到货单查询_新',
param: `供应商流水号_check=${num8}&供应商流水号=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`,
param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -87,14 +87,14 @@ export function addPurchaseOrder(num5, num6, num7) {
})
}
// 编辑采购单
export function editPurchaseOrder(num5, num6, num7, num8) {
export function editPurchaseOrder(num5, num6, num8) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_编辑到货单',
param: `备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}}&日期=${num8}`
param: `备注=${num5}&到货单流水号=${num6}&日期=${num8}`
}
})
}
@@ -144,14 +144,14 @@ export function EditArrivalOrderMX(num, num2, num3, num4, num5) {
}
})
}
export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5) {
export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_新增到货单明细',
param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}`
param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}&工艺计划流水号组=${num6}&采购计划明细流水号组=${num7}&本次到货数量组=${num8}&离线采购计划明细流水号组=${num9}&到货重量组=${num10}&到货金额组=${num11}&考勤编号=${id}`
}
})
}
@@ -168,14 +168,14 @@ export function deleteMateriel(num1, num2, num3) {
})
}
// 关联材料
export function addMateriel(num1, num2, num3, num4, num5, id) {
export function addMateriel(num1, num2, num3, num4, num5, num6, num7, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_到货单明细关联',
param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&考勤编号=${id}`
param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&到货重量组=${num6}&到货金额组=${num7}&考勤编号=${id}`
}
})
}

4
src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
View File

@@ -26,14 +26,14 @@ export function searchInvoiceDetail(num) {
})
}
// 发票增加
export function addInvoice(time1, money, send, remark, num3) {
export function addInvoice(time1, money, send, remark, num3, num4) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_发票_增加数据',
param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}`
param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}&到货单流水号组=${num4}`
}
})
}