diff --git a/src/mmpac/mmpac/pickm/card/index.js b/src/mmpac/mmpac/pickm/card/index.js
index dd96ad7d..a42109b2 100644
--- a/src/mmpac/mmpac/pickm/card/index.js
+++ b/src/mmpac/mmpac/pickm/card/index.js
@@ -277,7 +277,35 @@ class PickmCard extends Component {
                     ),
                     size: '100',
                     beSureBtnClick: () => {
-                        
+						let rowids = [];
+						let hids = [];
+			            let hid;
+						let rows = this.props.cardTable.getCheckedRows(AREA.bodyTable);
+						hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value;
+						hids.push(hid);
+						// 如果没有选中行，则提示并返回，不进行任何操作
+						if (!rows || rows.length <= 0) {
+							hids.push(this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value);
+						}
+						else {
+							rows.map((item) => {
+								let cpickm_bid = this.props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value;
+								rowids.push(cpickm_bid);
+							});
+						}
+						let data = {
+							cpickmids: hids,
+							cpickmbids: rowids
+						}
+						ajax({
+							url: URL.convertOtherIn,
+							data: data,
+							success: (res) => {
+								if (res.success) {
+									toast({ color: 'success', title: "推送成功" });
+								}
+							}
+						});
                         
                     },
                     cancelBtnClick: () => {
diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
index 041e66ba..81c85ba0 100644
--- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
+++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
@@ -798,7 +798,14 @@ export default async function clickBtn(props, id, text, record, index) {
 		case CARD_BTN.toOtherWarehouse://其他入库
 		
 		case "toOtherWarehouse":
-		     detailqueryBtnClick.call(this, this.props, record);
+			billstatus = props.form.getFormItemsValue(AREA.formArea, 'fbillstatus');
+			//审批态，行号不能修改
+			if (billstatus && billstatus.value && billstatus.value == 1) {
+				detailqueryBtnClick.call(this, this.props, record);
+			}else{
+				toast({ color: 'warning', title: "只有审批后单据才能生产其他入库单" });
+			}
+		     
 			//  rowids = [];
 			//  hids = [];
 			// if (record && record.values.cpickm_bid && record.values.cpickm_bid.value) {