子卷装箱

utils/getData3.js

@@ -245,3 +245,19 @@ export const AGVPass = (code) => request({
 	url:'api/pda/feeding/AGVPass',
 	data: {point_code: code}
 })
+/**
+ * 子卷装箱
+ */
+export const queryContainerNameBySaleOrder = (code) => request({
+	url:'api/pdmBiSubpackagerelation/queryContainerNameBySaleOrder',
+	data: {type: '1', container_name: code}
+})
+export const queryBoxSpec = (code) => request({
+	method: 'GET',
+	url:'api/pdmBiSubpackagerelation/queryBoxSpec',
+	data: {page: '0', size: '200', sort: 'material_name%2Cdesc', search: code}
+})
+export const updateEntityList = (checked, arr) => request({
+	url:'api/pdmBiSubpackagerelation/updateEntityList',
+	data: {checked: checked, tableMater: arr}
+})

utils/mork2.js

@@ -87,7 +87,8 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '气胀轴库维护', path: '/pages/SecondPhase/slitting/ShaftSave'},
 				{menu_id: '8', title: '分切子卷维护', path: '/pages/SecondPhase/slitting/ZjSave'},
 				{menu_id: '8', title: '备货区管理', path: '/pages/SecondPhase/slitting/StockingArea'},
-				{menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'}
+				{menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'},
+				{menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/slitting/ZjContainer'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
@@ -127,7 +128,7 @@ export const authority = () => {
 					{title: '空木箱入库',sonTree: [{title: '空木箱入库'}]},
 					{title: '发货区',sonTree: [{title: '发货区解绑'}]},
 					{title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}]},
-					{title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}]},
+					{title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷装箱'}]},
 					{title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'}]},
 					{title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]}
 				]
@@ -174,4 +175,50 @@ export const queryProductArea = () => {
 		data: [{text: '物料一', value: '001'}, {text: '物料a', value: '002'}, {text: '物料b', value: '003'}]
 	}
 	return res
+}
+export const queryContainerNameBySaleOrder = () => {
+	let res = {
+		"totalElements": 1,
+		"content": [
+			{
+				"workorder_id": "1597797877562871810",
+				"package_box_sn": null,
+				"quanlity_in_box": null,
+				"box_weight": 210.000000,
+				"sale_order_name": "100000011-100",
+				"customer_name": "10000252",
+				"customer_description": "惠州市禾腾能源科技有限公司",
+				"container_name": "A1522210281605B1",
+				"status": "99",
+				"box_type": "",
+				"sap_pcsn": "AA20000251",
+				"box_group": "0",
+				"paper_tube_description": " 璃纤维及其制品|FRP管|6英寸|25|1300",
+				"paper_weight": "22",
+				"weight": "2"
+			}
+		],
+		"code": 200,
+		"msg": "查询成功"
+	}
+	return res
+}
+export const queryBoxSpec = () => {
+	let res = {
+		"totalElements": 1,
+		"content": [
+			{
+				"box_high": "730",
+				"ivt_num": 3,
+				"num": "4",
+				"box_width": "676",
+				"material_name": "木制包装容器及板材|木箱|1300|1|6|1376*676*730",
+				"box_length": "1376",
+				"material_code": "441510009000470"
+			}
+		],
+		"code": 200,
+		"msg": "查询成功"
+	}
+	return res
 }

utils/request.js

@@ -50,6 +50,7 @@ const request = (params) => {
 				// }
 			})
 			.then(res => { // 成功
+				uni.hideLoading();
 				if (res.length === 1) {
 					uni.showModal({
 						content: 'request:fail',
@@ -120,10 +121,11 @@ const request = (params) => {
 				}
 			})
 			.catch(err => { // 错误
+				uni.hideLoading();
 				reject(err)
 			})
 			.finally(() => {
-				uni.hideLoading();
+				// uni.hideLoading();
 			})
 	})
 }