diff --git a/src/mmpac/mmpac/pickm/list/index.js b/src/mmpac/mmpac/pickm/list/index.js
index ff49ff2a..9b6b7430 100644
--- a/src/mmpac/mmpac/pickm/list/index.js
+++ b/src/mmpac/mmpac/pickm/list/index.js
@@ -336,6 +336,51 @@ class PickmList extends Component {
 				{createModal('BackDeliverDlg')}
 				{createModal('BackSerialnoDlg')}
 				{createModal('SetBackDeliverDlg')}
+				{createModal('NCTable_3c81fe87', {
+                    title: '借料入库明细',
+                    content: (
+                        <div class="flex-container" style={{height: '100%'}}>
+                            {createSimpleTable('NCTable_3c81fe87', {showIndex: true})}</div>
+                    ),
+                    size: 'max',
+                    beSureBtnClick: () => {
+                        let rowids = [];
+                        let hids = [];
+                        let hid;
+						let rows =this.props.table.getCheckedRows('NCTable_3c81fe87');
+                        hid = this.props.cardTable.getCheckedRows(AREA.bodyTable)[0].billId;
+                        hids.push(hid);
+                        // 如果没有选中行，则提示并返回，不进行任何操作
+                        if (!rows || rows.length <= 0) {
+                            showWarningInfo('请选择行');
+                            return;
+                        }
+                        rows.map((item) => {
+                            let cpickm_bid = this.props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, FIELD.bid).value;
+                            rowids.push(cpickm_bid);
+                        });
+                        let data = {
+                            cpickmids: hids,
+                            cpickmbids: rowids
+                        }
+                        console.log('data = ', data);
+                        ajax({
+                            url: URL.convertOtherIn,
+                            data: data,
+                            success: (res) => {
+                                if (res.success) {
+                                    toast({color: 'success', title: "推送成功"});
+                                    this.props.modal.close(AREA.borrowMaterialDialog);
+                                }
+                            }
+                        });
+
+                    },
+                    cancelBtnClick: () => {
+                        this.props.modal.close(AREA.borrowMaterialDialog)
+                    },
+                    userControl: true
+                })}       
 			</div>
 		);
 	}
diff --git a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js
index 9a612bb3..de4b3612 100644
--- a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js
+++ b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js
@@ -461,6 +461,40 @@ export default function (props, key, text, record, index) {
                 }
             });
             break;
+        case "to_generalIn"://借料入库
+            cpickmids = [];
+            if (record && record.cpickmid) {
+                cpickmids.push(record.cpickmid);
+            } else {
+                let rows = _this.props.table.getCheckedRows(AREA.tableArea);
+                // 如果没有选中行，则提示并返回，不进行任何操作
+                if (rows.length <= 0) {
+                    showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068')  国际化处理： 请选择需要删除的数据！*/
+                    );
+                    return;
+                }
+                rows.forEach((row) => {
+                    let pk = row.data.values.cpickmid.value;
+                    if (pk) {
+                        cpickmids.push(pk);
+                    }
+                });
+            }
+            data = {
+                pks: cpickmids
+            }
+            ajax({
+                url: '/nccloud/mmpac/pickm/pickmByIdsQuery.do',
+                data: data,
+                success: (res) => {
+                    if(res.success){
+                        props.table.setAllTableData("NCTable_3c81fe87", res.data.data[0].card_body.rows);
+                        props.modal.show("NCTable_3c81fe87");
+                        toast({ content: "查询成功", color: 'success' });
+                    }
+                }
+            });
+            break;
         case "to_pmo"://流程生产订单
             cpickmids = [];
             if (record && record.cpickmid) {