diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
index 64d5f82..311c38a 100644
--- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
+++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
@@ -795,6 +795,41 @@ export default async function clickBtn(props, id, text, record, index) {
 		case CARD_BTN.PickmQueryYL:
 			let pickmReservQuery = reserveQueryBtnClick.bind(this);
 			return pickmReservQuery(props);
+		case CARD_BTN.toOtherWarehouse:
+			 rowids = [];
+			 hids = [];
+			if (record && record.values.cpickm_bid && record.values.cpickm_bid.value) {
+				rowids.push(record.values.cpickm_bid.value);
+				hid = record.values.cpickmid.value;
+			} else {
+				let rows = this.props.cardTable.getCheckedRows(AREA.bodyTable);
+				hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value;
+				// 如果没有选中行，则提示并返回，不进行任何操作
+				if (!rows || rows.length <= 0) {
+					hids.push(this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value);
+				}
+				else {
+					rows.map((item) => {
+						let cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value;
+						rowids.push(cpickm_bid);
+					});
+
+				}
+			}
+			data = {
+				cpickmids: hids,
+				cpickmbids: rowids
+			}
+			ajax({
+				url: URL.convertOtherIn,
+				data: data,
+				success: (res) => {
+					if (res.success) {
+						toast({ color: 'success', title: "推送成功" });
+					}
+				}
+			});
+			break;
 		default:
 			break;
 	}
diff --git a/src/mmpac/mmpac/pickm/constance/index.js b/src/mmpac/mmpac/pickm/constance/index.js
index 1cb6def..521d3fa 100644
--- a/src/mmpac/mmpac/pickm/constance/index.js
+++ b/src/mmpac/mmpac/pickm/constance/index.js
@@ -71,6 +71,8 @@ const CARD_BTN = {
     PickmDeliveryWithSet: 'PickmDeliveryWithSet',//成套领料
     PickmReDeliveryWithSet: 'PickmReDeliveryWithSet',//补成套领料
     ToReqPickm: 'ToReqPickm',//备料
+    
+    toOtherWarehouse: 'toOtherWarehouse',//其他入库
     DirectTrans: 'DirectTrans',//直接备料
     PickmBackDelivery: 'PickmBackDelivery',//退料
     PickmBackDeliveryWithSet: 'PickmBackDeliveryWithSet',//成套退料
@@ -206,7 +208,8 @@ const URL = {
     replaceDoURL: '/nccloud/mmpac/pickm/replace.do',
     replaceAutoMatchURL:'/nccloud/mmpac/pickm/replaceAutoMatch.do',
     deleteLineURL: '/nccloud/mmpac/pickm/deleteline.do',
-    queryByCondURL:'/nccloud/mmpac/pickm/queryByCond.do'
+    queryByCondURL:'/nccloud/mmpac/pickm/queryByCond.do',
+    convertOtherIn:'/nccloud/mmpac/pickm/convertOtherIn.do'
 };
 
 const tabURL = '/list';