diff --git a/src/api/plan/order.js b/src/api/plan/order.js
index ab9a84e..3e00824 100644
--- a/src/api/plan/order.js
+++ b/src/api/plan/order.js
@@ -1,6 +1,30 @@
import request from '@/utils/request'
-//通过母订单id查询最新工单列表
+// 获取班次信息
+export function getProShifts() {
+ return request({
+ url: '/plan/order/getProShifts/',
+ method: 'get'
+ })
+}
+
+// 通过物料code获取工艺信息
+export function getProRoutes(prodCode) {
+ return request({
+ url: '/plan/order/getProRoutes/' + prodCode,
+ method: 'get'
+ })
+}
+
+// 通过工艺code获取设备信息
+export function getProEquipment(routeCode) {
+ return request({
+ url: '/plan/order/getProEquipment/' + routeCode,
+ method: 'get'
+ })
+}
+
+// 通过母订单id查询最新工单列表
export function getWorkOrderList(id) {
return request({
url: '/plan/order/getWorkOrderList/' + id,
@@ -8,7 +32,7 @@ export function getWorkOrderList(id) {
})
}
-//通过母订单id查询最新订单列表
+// 通过母订单id查询最新订单列表
export function getOrderList(id) {
return request({
url: '/plan/order/getOrderList/' + id,
diff --git a/src/api/wms/odsRawOrderIn.js b/src/api/wms/odsRawOrderIn.js
new file mode 100644
index 0000000..d81a5bc
--- /dev/null
+++ b/src/api/wms/odsRawOrderIn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询包材到货单列表
+export function listOdsRawOrderIn(query) {
+ return request({
+ url: '/wms/odsRawOrderIn/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询包材到货单详细
+export function getOdsRawOrderIn(rawOrderInId) {
+ return request({
+ url: '/wms/odsRawOrderIn/' + rawOrderInId,
+ method: 'get'
+ });
+}
+
+// 新增包材到货单
+export function addOdsRawOrderIn(data) {
+ return request({
+ url: '/wms/odsRawOrderIn',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改包材到货单
+export function updateOdsRawOrderIn(data) {
+ return request({
+ url: '/wms/odsRawOrderIn',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除包材到货单
+export function delOdsRawOrderIn(rawOrderInId) {
+ return request({
+ url: '/wms/odsRawOrderIn/' + rawOrderInId,
+ method: 'delete'
+ });
+}
diff --git a/src/api/wms/wmsRawOrderInSn.js b/src/api/wms/wmsRawOrderInSn.js
new file mode 100644
index 0000000..c83ae61
--- /dev/null
+++ b/src/api/wms/wmsRawOrderInSn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询原材料收货明细列表
+export function listWmsRawOrderInSn(query) {
+ return request({
+ url: '/wms/wmsRawOrderInSn/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询原材料收货明细详细
+export function getWmsRawOrderInSn(rawOrderInSnId) {
+ return request({
+ url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+ method: 'get'
+ });
+}
+
+// 新增原材料收货明细
+export function addWmsRawOrderInSn(data) {
+ return request({
+ url: '/wms/wmsRawOrderInSn',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改原材料收货明细
+export function updateWmsRawOrderInSn(data) {
+ return request({
+ url: '/wms/wmsRawOrderInSn',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除原材料收货明细
+export function delWmsRawOrderInSn(rawOrderInSnId) {
+ return request({
+ url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+ method: 'delete'
+ });
+}
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 0d0850c..a64b030 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -124,16 +124,16 @@
>导出
-
- 展开/折叠
-
-
+
+
+
+
+
+
+
+
+
+
@@ -334,22 +334,26 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -358,7 +362,7 @@
-
+
@@ -368,14 +372,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -388,7 +388,7 @@
-
+
@@ -435,6 +435,9 @@
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 5957b30..ea5bb60 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -94,7 +94,11 @@
-
+
+
+ {{ scope.row.status == 1 ? "是" : "否" }}
+
+
@@ -150,7 +154,7 @@
-
+
+
+
+
+
+
-
-
-
-
-