diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index e7136f7b..61619cd5 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -103,7 +103,7 @@ export function submitOutStore(...params) {
data: {
type: '2',
name: '库存管理_物料出库_出库记录_增加数据',
- param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}`
+ param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}&领料单流水号=${params[7]}&领料人流水号=${params[8]}&仓库流水号=${params[9]}&出库类别=${params[10]}`
}
})
}
@@ -119,3 +119,14 @@ export function errorRecord(...params) {
}
})
}
+// 初始化出库类别
+export function initOutType() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '3',
+ name: 'select * from 库存管理_出库类别'
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index ad8dd709..58d19483 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -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({
diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index 9ef1fd87..1d0ed42e 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -45,7 +45,7 @@ export function doneContract(...params) {
data: {
type: '2',
name: '采购管理_采购合同_增加数据',
- param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}`
+ param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}`
}
})
}
@@ -61,3 +61,14 @@ export function searchBaseInfo(id) {
}
})
}
+// 实时保存单价
+export function savePrice(price, num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where 物料流水号 = ${num1} and 询价单流水号 = ${num2}`
+ }
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 39e0294c..4646e1be 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -22,7 +22,7 @@ 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
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
const service = axios.create({
- baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 75b74f89..b84e353b 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -129,6 +129,8 @@ export function groupBy(datas, keys) {
group.key.数量 = group.data1 += v.数量
group.data2 = group.data2 || ''
group.key.机床图号_组号 = group.data2 += (v.机床图号 || '') + '-' + (v.组号 ? v.组号.split('组')[0] : '') + ';'
+ group.data3 = group.data3 || 0
+ group.key.合计 = group.data3 += v.合计
})
groups.map(v => {
result.push(v.key)
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index e8e68868..14e4e766 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -185,6 +185,15 @@
:value="item.value"/>
+
+
+
+
+