diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index d17db26..bc4e4d6 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -29,40 +29,20 @@
- | 序号 |
- 选择 |
- 订单号 |
+ 木箱码 |
子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
+ 物料编码 |
+ 物料名称 |
+ 重量KG |
-
- | {{Number(i) + 1}} |
- |
- {{e.mfg_order_name}} |
+
+ | {{e.package_box_SN}} |
{{e.container_name}} |
- {{e.point_code}} |
- {{e.split_group}} |
- {{e.manufacture_sort}} |
- {{e.manufacture_date}} |
- {{e.paper_tube_or_FRP}} |
- {{e.paper_tube_material}} |
- {{e.paper_tube_description}} |
- {{e.paper_tube_model}} |
- {{e.FRP_material}} |
- {{e.FRP_description}} |
- {{e.FRP_model}} |
+ {{e.product_name}} |
+ {{e.product_description}} |
+ {{e.net_weight}} |
@@ -70,8 +50,9 @@
-
-
+
+
+
@@ -79,7 +60,7 @@
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index 581e157..52cac2f 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -29,40 +29,20 @@
- | 序号 |
- 选择 |
- 订单号 |
+ 木箱码 |
子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
+ 物料编码 |
+ 物料名称 |
+ 重量KG |
-
- | {{Number(i) + 1}} |
- |
- {{e.mfg_order_name}} |
+
+ | {{e.package_box_SN}} |
{{e.container_name}} |
- {{e.point_code}} |
- {{e.split_group}} |
- {{e.manufacture_sort}} |
- {{e.manufacture_date}} |
- {{e.paper_tube_or_FRP}} |
- {{e.paper_tube_material}} |
- {{e.paper_tube_description}} |
- {{e.paper_tube_model}} |
- {{e.FRP_material}} |
- {{e.FRP_description}} |
- {{e.FRP_model}} |
+ {{e.product_name}} |
+ {{e.product_description}} |
+ {{e.net_weight}} |
@@ -70,8 +50,8 @@
-
-
+
+
@@ -79,7 +59,7 @@
diff --git a/pages/WarehouseManage/SemifinishedInStore.vue b/pages/WarehouseManage/SemifinishedInStore.vue
index be301e0..125a15e 100644
--- a/pages/WarehouseManage/SemifinishedInStore.vue
+++ b/pages/WarehouseManage/SemifinishedInStore.vue
@@ -35,40 +35,34 @@
- | 序号 |
- 选择 |
- 订单号 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
+ 状态 |
+ 工单号 |
+ 母卷号 |
+ 机台编码 |
+ 产品编码 |
+ 理论长度 |
+ 开始时间 |
+ 结束时间 |
+ 总重量 |
+ 车号 |
+ 生产区域 |
+ 更新时间 |
-
- | {{Number(i) + 1}} |
- |
+
+ | {{e.status_name}} |
{{e.mfg_order_name}} |
{{e.container_name}} |
{{e.point_code}} |
- {{e.split_group}} |
- {{e.manufacture_sort}} |
- {{e.manufacture_date}} |
- {{e.paper_tube_or_FRP}} |
- {{e.paper_tube_material}} |
- {{e.paper_tube_description}} |
- {{e.paper_tube_model}} |
- {{e.FRP_material}} |
- {{e.FRP_description}} |
- {{e.FRP_model}} |
+ {{e.product_name}} |
+ {{e.theory_height}} |
+ {{e.realstart_time}} |
+ {{e.realend_time}} |
+ {{e.productin_qty}} |
+ {{e.agvno}} |
+ {{e.product_area}} |
+ {{e.update_time}} |
@@ -76,7 +70,8 @@
-
+
+
@@ -84,7 +79,7 @@
diff --git a/pages/WarehouseManage/SemifinishedOutStore.vue b/pages/WarehouseManage/SemifinishedOutStore.vue
index 1cd502f..5a9d82c 100644
--- a/pages/WarehouseManage/SemifinishedOutStore.vue
+++ b/pages/WarehouseManage/SemifinishedOutStore.vue
@@ -35,40 +35,26 @@
- | 序号 |
- 选择 |
- 订单号 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
+ 点位 |
+ 母卷号 |
+ 产品编号 |
+ 产品描述 |
+ 总重量 |
+ 入烘箱时间 |
+ 出烘箱时间 |
+ 是否烘烤 |
-
- | {{Number(i) + 1}} |
- |
- {{e.mfg_order_name}} |
- {{e.container_name}} |
+
| {{e.point_code}} |
- {{e.split_group}} |
- {{e.manufacture_sort}} |
- {{e.manufacture_date}} |
- {{e.paper_tube_or_FRP}} |
- {{e.paper_tube_material}} |
- {{e.paper_tube_description}} |
- {{e.paper_tube_model}} |
- {{e.FRP_material}} |
- {{e.FRP_description}} |
- {{e.FRP_model}} |
+ {{e.container_name}} |
+ {{e.product_name}} |
+ {{e.description}} |
+ {{e.productin_qty}} |
+ {{e.in_time}} |
+ {{e.out_time}} |
+ {{e.is_bake}} |
@@ -76,8 +62,8 @@
-
-
+
+
@@ -85,7 +71,7 @@
diff --git a/utils/getData2.js b/utils/getData2.js
index 851794f..6a68972 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -92,4 +92,76 @@ export const outConfirm = (code, rows) => request({
point_code: code,
cut_rows: rows
}
+})
+
+/**
+ * 半成品入库
+ */
+// 1.1半成品入库初始化查询
+export const coolIOQuery = (name) => request({
+ url:'api/pda/coolIn/coolIOQuery',
+ data: {
+ container_name: name
+ }
+})
+// 1.2确认入库
+export const confirmInstor = (raw_jo, code, is_bake) => request({
+ url:'api/pda/coolIn/confirmInstor',
+ data: {
+ raw_jo: raw_jo,
+ point_code: code,
+ is_bake: is_bake
+ }
+})
+
+/**
+ * 半成品出库
+ */
+// 1.1半成品出库初始化查询
+export const outcoolIOQuery = (name, area, code) => request({
+ url:'api/pda/coolOut/coolIOQuery',
+ data: {
+ container_name: name,
+ product_area: area,
+ point_code: code
+ }
+})
+// 1.2确认出库
+export const outconfirmInstor = (raw_jo, code, is_bake) => request({
+ url:'api/pda/coolOut/confirmInstor',
+ data: {
+ raw_jo: raw_jo
+ }
+})
+
+/**
+ * 报废入库
+ */
+// 1.1入库初始化查询
+export const boxQuery = (no, option, code) => request({
+ url:'api/pda/st/boxQuery',
+ data: {
+ box_no: no,
+ option: option,
+ point_code: code
+ }
+})
+// 1.2确认出库
+export const stConfirm = (box_jo, code) => request({
+ url:'api/pda/st/confirm',
+ data: {
+ box_jo: box_jo,
+ point_code: code
+ }
+})
+
+/**
+ * 入库确认
+ */
+// 1.3补码
+export const stPrint = (box_jo) => request({
+ url:'api/pda/st/print',
+ data: {
+ box_jo: box_jo
+ }
})
\ No newline at end of file