领料传参修改

zhangwencui

5 天以前 7cf040285e74c2c3b9ee011abdab15021d139c30

领料传参修改

 src/api/mes/wm/productissue/detail/index.ts

@@ -8,6 +8,7 @@
    lineId?: number; // 领料单行编号
    materialStockId?: number; // 库存记录编号
    itemId?: number; // 物料编号
    mdmItemId?: number; // MDM物料编号
    quantity?: number; // 数量
    batchId?: number; // 批次编号
    batchCode?: string; // 批次号

 src/api/mes/wm/productissue/line/index.ts

@@ -8,6 +8,7 @@
    id?: number; // 行编号
    issueId?: number; // 领料单编号
    itemId?: number; // 物料编号
    mdmItemId?: number; // MDM物料编号
    itemCode?: string; // 物料编码
    itemName?: string; // 物料名称
    specification?: string; // 规格型号

 src/views/wls/materialstock/components/select-dialog.vue

@@ -19,12 +19,14 @@
  defineProps<{
    batchId?: number;
    itemId?: number;
    mdmItemId?: number;
    virtualFilter?: VirtualFilter;
    warehouseId?: number;
  }>(),
  {
    batchId: undefined,
    itemId: undefined,
    mdmItemId: undefined,
    virtualFilter: 'exclude',
    warehouseId: undefined,
  },
@@ -159,7 +161,7 @@
            // 默认查未冻结
            frozen: false,
            itemTypeId: searchItemTypeId.value,
            itemId: formValues.itemId ?? props.itemId,
            itemId: formValues.mdmItemId ?? props.mdmItemId,
            warehouseId: formValues.warehouseId ?? props.warehouseId,
            virtualFilter:
              props.virtualFilter === 'all' ? undefined : props.virtualFilter,

 src/views/wls/materialstock/components/select.vue

@@ -19,6 +19,7 @@
    batchId?: number;
    disabled?: boolean;
    itemId?: number;
    mdmItemId?: number;
    modelValue?: number;
    placeholder?: string;
    virtualFilter?: 'all' | 'exclude' | 'only';
@@ -29,6 +30,7 @@
    batchId: undefined,
    disabled: false,
    itemId: undefined,
    mdmItemId: undefined,
    modelValue: undefined,
    placeholder: '请选择库存',
    virtualFilter: 'exclude',
@@ -151,6 +153,7 @@
    ref="dialogRef"
    :batch-id="batchId"
    :item-id="itemId"
    :mdm-item-id="mdmItemId"
    :virtual-filter="virtualFilter"
    :warehouse-id="warehouseId"
    @selected="handleSelected"

 src/views/wls/productissue/data.ts

@@ -399,7 +399,7 @@
      dependencies: {
        triggerFields: ['itemId'],
        componentProps: (values) => ({
          itemId: values.itemId,
          mdmItemId: values.itemId,
        }),
      },
    },

 src/views/wls/productissue/modules/detail-form.vue

@@ -54,6 +54,10 @@
      (await formApi.getValues()) as MesWmProductIssueDetailApi.ProductIssueDetail;
    data.issueId = issueId.value;
    data.lineId = lineId.value;
    // itemId 使用 mdmItemId 的值
    if (data.mdmItemId) {
      data.itemId = data.mdmItemId;
    }
    try {
      await (formData.value?.id
        ? updateProductIssueDetail({ ...data, id: formData.value.id })
@@ -85,6 +89,10 @@
      modalApi.lock();
      try {
        formData.value = await getProductIssueDetail(data.detailId);
        // 编辑时表单 itemId 使用 mdmItemId 的值
        if (formData.value.mdmItemId) {
          formData.value.itemId = formData.value.mdmItemId;
        }
        // 设置到 values
        await formApi.setValues(formData.value);
      } finally {

 src/views/wls/productissue/modules/line-list.vue

@@ -83,7 +83,7 @@

/** 拣货：直接打开明细创建表单 */
function handlePicking(row: MesWmProductIssueLineApi.ProductIssueLine) {
  openDetailForm(row.id!, row.itemId);
  openDetailForm(row.id!, row.mdmItemId);
}

/** 打开拣货明细表单 */
@@ -184,7 +184,7 @@
        <DetailList
          :details="getExpandedDetails(row)"
          :form-type="formType"
          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
          @edit="(detailId) => openDetailForm(row.id!, row.mdmItemId, detailId)"
          @refresh="loadLineDetails(row.id!)"
        />
      </template>