From 7021b12a5bc627d3782973c7bb25ee85297b32fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Tue, 29 Oct 2024 18:09:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/detail.js | 47 +++ src/api/wms/raw.js | 44 +++ src/views/wms/detail/index.vue | 527 +++++++++++++++++++++++++++++++++ src/views/wms/raw/index.vue | 500 +++++++++++++++++++++++++++++++ 4 files changed, 1118 insertions(+) create mode 100644 src/api/wms/detail.js create mode 100644 src/api/wms/raw.js create mode 100644 src/views/wms/detail/index.vue create mode 100644 src/views/wms/raw/index.vue diff --git a/src/api/wms/detail.js b/src/api/wms/detail.js new file mode 100644 index 0000000..0231de9 --- /dev/null +++ b/src/api/wms/detail.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// 查询白坯原材料入库明细列表 +export function listDetail(query) { + return request({ + url: '/wms/detail/list', + method: 'get', + params: query + }) +} + +// 查询白坯原材料入库明细详细 +export function getDetail(id) { + return request({ + url: '/wms/detail/' + id, + method: 'get' + }) +} + +// 新增白坯原材料入库明细 +export function addDetail(data) { + return request({ + url: '/wms/detail', + method: 'post', + data: data + }) +} + +// 修改白坯原材料入库明细 +export function updateDetail(data) { + return request({ + url: '/wms/detail', + method: 'put', + data: data + }) +} + +// 删除白坯原材料入库明细 +export function delDetail(id) { + return request({ + url: '/wms/detail/' + id, + method: 'delete' + }) +} + + + diff --git a/src/api/wms/raw.js b/src/api/wms/raw.js new file mode 100644 index 0000000..10a9518 --- /dev/null +++ b/src/api/wms/raw.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询白坯原材料入库列表 +export function listRaw(query) { + return request({ + url: '/wms/raw/list', + method: 'get', + params: query + }) +} + +// 查询白坯原材料入库详细 +export function getRaw(id) { + return request({ + url: '/wms/raw/' + id, + method: 'get' + }) +} + +// 新增白坯原材料入库 +export function addRaw(data) { + return request({ + url: '/wms/raw', + method: 'post', + data: data + }) +} + +// 修改白坯原材料入库 +export function updateRaw(data) { + return request({ + url: '/wms/raw', + method: 'put', + data: data + }) +} + +// 删除白坯原材料入库 +export function delRaw(id) { + return request({ + url: '/wms/raw/' + id, + method: 'delete' + }) +} diff --git a/src/views/wms/detail/index.vue b/src/views/wms/detail/index.vue new file mode 100644 index 0000000..b413b20 --- /dev/null +++ b/src/views/wms/detail/index.vue @@ -0,0 +1,527 @@ + + + diff --git a/src/views/wms/raw/index.vue b/src/views/wms/raw/index.vue new file mode 100644 index 0000000..9136c09 --- /dev/null +++ b/src/views/wms/raw/index.vue @@ -0,0 +1,500 @@ + + + From f8e5b30d97956443178558b8a3474083939fb61b Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 30 Oct 2024 12:15:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?wms=E7=99=BD=E8=83=9A=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/wmsbpworkorder.js | 19 ++++++++++++++++--- src/views/wms/workorderBP/index.vue | 28 +++++++++++++++------------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/api/wms/wmsbpworkorder.js b/src/api/wms/wmsbpworkorder.js index 281df1a..7669352 100644 --- a/src/api/wms/wmsbpworkorder.js +++ b/src/api/wms/wmsbpworkorder.js @@ -42,7 +42,7 @@ export function getOrderAndWork(data) { }) } -// 查询生产工单列表 +// 查询生产工单列表s export function listWorkorder(query) { return request({ url: '/plan/bppro/workorder/list', @@ -50,7 +50,14 @@ export function listWorkorder(query) { params: query }); } - +// 查询生产工单列表s +export function listNeWorkorder(query) { + return request({ + url: '/wms//WmsToWCSInterface/listNe', + method: 'get', + params: query + }); +} // 查询生产工单详细 export function getWorkorder(workorderId) { return request({ @@ -108,4 +115,10 @@ export function subChangeWorkOrderM(data){ method:'post', data:data }) - } \ No newline at end of file + } +export function getWorkOrdersWMS(workorderCode) { + return request({ + url:'/wms/WmsToWCSInterface/getWorkOrders/'+workorderCode, + method:'get' + }) +} diff --git a/src/views/wms/workorderBP/index.vue b/src/views/wms/workorderBP/index.vue index 09b3e62..8176d6a 100644 --- a/src/views/wms/workorderBP/index.vue +++ b/src/views/wms/workorderBP/index.vue @@ -102,7 +102,6 @@ - @@ -122,7 +121,9 @@
{{ item }}
--> - + + + @@ -210,21 +211,17 @@ label="生产订单"> - - - - + + + + @@ -273,7 +270,9 @@