生产退料增加成品库

fe/PDA/pages/return/returnToWarehouse.vue

@@ -158,12 +158,12 @@
 				});
 				locations(code).then(res => {
 					if (res != null) {
-						if (res.type == 5) {
+						if (res.type == 4||res.type == 5) {
 							that.fromLocation = res;
 							this.openPackLabel();
 							this.closeScanFromLocationPopup();
 						} else {
-							that.showMessage('扫描的库位【' + code + '】不是线边库位');
+							that.showMessage('扫描的库位【' + code + '】不是线边库位或成品库位');
 						}
 					} else {
 						that.showMessage('未查询到库位【' + code + '】');

fe/PDA/pages/task/unProducePickDetail.vue

@@ -412,7 +412,7 @@
 					itemCode: result.data.itemCode,
 					lot: result.data.lot,
 					inventoryStatus: 2, //库存状态默认2
-					locationTypes: [2],
+					locationTypes: [2,4],
 					sortBy: 'PackingCode asc'
 				};
 				getBalancesByFilter(params)
@@ -420,7 +420,7 @@
 						if (res.totalCount === 0) {
 							this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
 								result
-								.data.lot + '】在【原料库】未查询到库存信息');
+								.data.lot + '】在【原料库】或【成品库】未查询到库存信息');
 						} else {
 							callback(res);
 						}