diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js new file mode 100644 index 00000000..643fe665 --- /dev/null +++ b/src/api/Inventory/CreatePickingList.js @@ -0,0 +1,122 @@ +import request from '@/utils/request' + +// 初始化人员 +export function initPickPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0' + } + }) +} +// 初始化机床项目 +export function initMachineProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 查询三表 +export function searchTable(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_三表_查询数据', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`, + Pagination: params[4] + '&' + params[5] + } + }) +} +// 领料单查询 +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_查询数据', + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 创建领料单 +export function createList(num, remark) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_增加数据', + param: '领料人流水号=' + num + '&领料单备注=' + remark + } + }) +} +// 删除领料单 +export function dropList(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_删除数据', + param: '领料单流水号=' + num + } + }) +} +// 选入领料单 +export function searchListDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_查询数据', + param: `领料单流水号=${params[0]}` + } + }) +} +// 选入领料单 +export function selectIntoList(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单明细_增加数据', + param: `基本件流水号组=${params[0]}&标准件和外购件流水号组=${params[1]}&领料单流水号=${params[2]}` + } + }) +} +// 删除领料单 +export function dropListDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_删除数据', + param: '领料单明细流水号=' + num + } + }) +} diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue new file mode 100644 index 00000000..15561bbd --- /dev/null +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -0,0 +1,645 @@ + + + + + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 7f13feea..5655b5fe 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -155,7 +155,7 @@ 定额员 {{ tableData2[0] ? tableData2[0].定额员 : '' }} 工艺完成 - {{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }} + {{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }} 加工开始 {{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }} 加工结束