军泰伟业 1.生产订单添加领料功能 2.将报工台账单的查看投入迁移到生产订单

gaoluyang

15 小时以前 89b4ccc1bf351417bbe0acbc8246a681514bd173

军泰伟业
1.生产订单添加领料功能
2.将报工台账单的查看投入迁移到生产订单

 src/api/productionManagement/productStructureRecord.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
// ç”Ÿäº§è®¢å•é¢†æ–™è®°å½•æŽ¥å£
import request from "@/utils/request";

// æ ¹æ®è®¢å•ID查询物料清单（领料数据）
export function listPage(query) {
  return request({
    url: "/productStructureRecord/listPage",
    method: "get",
    params: query,
  });
}

// é¢†æ–™æäº¤
export function pick(data) {
  return request({
    url: "/productStructureRecord/pick",
    method: "post",
    data: data,
  });
}

 src/components/PIMTable/PIMTable.vue

@@ -137,7 +137,7 @@
              v-if="o.showHide ? o.showHide(scope.row) : true"
              :disabled="o.disabled ? o.disabled(scope.row) : false"
              :plain="o.plain"
              type="primary"
              :type="o.type && ['primary', 'success', 'warning', 'danger', 'info'].includes(o.type) ? o.type : 'primary'"
              :style="{
                color:
                  o.name === '删除' || o.name === 'delete'

 src/views/productionManagement/productionOrder/New.vue

@@ -225,7 +225,14 @@
            <el-table-column label="产品名称" prop="productName" min-width="120" />
            <el-table-column label="单位产出需要数量" min-width="140">
              <template #default="{ row }">
                <el-input-number v-model="row.unitQuantity" :min="0" :precision="2" size="small" style="width: 100%" />
                <el-input-number 
                  v-model="row.unitQuantity" 
                  :min="0" 
                  :precision="2" 
                  size="small" 
                  style="width: 100%" 
                  @change="(val) => handleUnitQuantityChange(val, row)"
                />
              </template>
            </el-table-column>
            <el-table-column label="需求数量" min-width="120">
@@ -477,16 +484,32 @@
  });
};

// ç›‘听物料清单变化，当单位产出需要数量变化时重新计算需求数量
watch(() => productStructureRecords.value, (newRecords, oldRecords) => {
  if (oldRecords && oldRecords.length > 0) {
    oldRecords.forEach((oldItem, index) => {
      const newItem = newRecords[index];
      if (oldItem && newItem && newItem.unitQuantity !== oldItem.unitQuantity) {
        newItem.demandedQuantity = (newItem.unitQuantity || 1) * (formState.value.quantity || 1);
      }
    });
  }
}, { deep: true });

// ç›‘听需求数量变化，重新计算物料需求数量
watch(() => formState.value.quantity, (newQty) => {
  if (productStructureRecords.value.length > 0 && newQty) {
    productStructureRecords.value = productStructureRecords.value.map(item => ({
      ...item,
      demandedQuantity: (item.unitQuantity || 1) * newQty
    }));
    productStructureRecords.value.forEach(item => {
      item.demandedQuantity = (item.unitQuantity || 1) * newQty;
    });
  }
});

// å•ä½äº§å‡ºéœ€è¦æ•°é‡å˜åŒ–处理
const handleUnitQuantityChange = (val, row) => {
  row.demandedQuantity = (val || 1) * (formState.value.quantity || 1);
};

// å·¥åºé€‰æ‹©å˜åŒ–处理
const handleProcessChange = (processId, row) => {
  const selectedProcess = processRouteItemsOptions.value.find(item => item.processId === processId);

 src/views/productionManagement/productionOrder/index.vue

@@ -71,12 +71,82 @@
                         v-model:visible="isShowNewModal"
                         type="qualified"
                         @completed="handleQuery" />

    <!-- æŸ¥çœ‹æŠ•å…¥å¼¹æ¡† -->
    <el-dialog v-model="inputDialogVisible"
               title="投入"
               width="1000px">
      <PIMTable
        rowKey="id"
        :column="inputTableColumn"
        :tableData="inputTableData"
        :page="inputPage"
        :tableLoading="inputTableLoading"
        @pagination="handleInputPagination"
      />
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="inputDialogVisible = false">关闭</el-button>
        </div>
      </template>
    </el-dialog>

    <!-- é¢†æ–™å¼¹æ¡† -->
    <el-dialog v-model="pickingDialogVisible"
               title="工单领料"
               width="1200px"
               :close-on-click-modal="false">

      <el-table
        :data="pickingTableData"
        border
        size="small"
        @selection-change="handlePickingSelectionChange"
        :header-cell-style="{ background: '#f5f7fa' }"
        show-summary
        :summary-method="summarizePickingTable"
      >
        <el-table-column type="selection" width="50" align="center" />
        <el-table-column label="产品名称" prop="productName" min-width="120" />
        <el-table-column label="图纸编号" prop="model" min-width="100" />
        <el-table-column label="单位用量" prop="unitQuantity" min-width="100" align="center" />
        <el-table-column label="单位" prop="unit" min-width="100" align="center" />
        <el-table-column label="需求数量" prop="demandedQuantity" min-width="100" align="center" />
        <el-table-column label="已领料数量" prop="completedQuantity" min-width="100" align="center" />
        <el-table-column label="未领料数量" prop="unpickedQuantity" min-width="100" align="center" />
        <el-table-column label="领料数量" min-width="180" align="center" prop="quantity">
          <template #default="{ row }">
            <el-input-number 
              v-model="row.quantity" 
              :min="0" 
              :max="row.unpickedQuantity"
              :precision="0" 
              size="small" 
              style="width: 160px"
              @change="(val) => handlePickingQuantityChange(val, row)"
            />
          </template>
        </el-table-column>
      </el-table>
      <div class="picking-footer-info">
        <span>已选 {{ pickingSelectedRows.length }} æ¡</span>
        <span>{{ pickingTableData.length }} æ¡è®°å½•</span>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="success" @click="handlePickingNext">确认</el-button>
          <el-button @click="pickingDialogVisible = false">取消</el-button>
        </div>
      </template>
    </el-dialog>

  </div>
</template>

<script setup>
  import { onMounted, ref } from "vue";
  import { onMounted, ref, computed } from "vue";
  import { ElMessageBox } from "element-plus";
  import { Setting } from '@element-plus/icons-vue';
  import dayjs from "dayjs";
  import { useRouter } from "vue-router";
  import {
@@ -86,6 +156,9 @@
    listProcessBom, delProductOrder, startOrPause,
  } from "@/api/productionManagement/productionOrder.js";
  import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
  import { productionProductInputListPage } from "@/api/productionManagement/productionProductInput.js";
  import { listPage as listProductStructureRecord, pick as pickMaterial } from "@/api/productionManagement/productStructureRecord.js";

  import {fileDel} from "@/api/financialManagement/revenueManagement.js";
  import PIMTable from "@/components/PIMTable/PIMTable.vue";
  const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
@@ -158,11 +231,11 @@
      label: "操作",
      align: "center",
      fixed: "right",
      width: 240,
      width: 360,
      operation: [
        {
          name: "开始",
          type: "text",
          type: "success",
          showHide: row => row.status === '待生产',
          clickFun: row => {
            handleStartOrPause(row);
@@ -170,10 +243,17 @@
        },
        {
          name: "暂停",
          type: "text",
          type: "danger",
          showHide: row => row.status === '生产中',
          clickFun: row => {
            handleStartOrPause(row);
          },
        },
        {
          name: "领料",
          type: "success",
          clickFun: row => {
            showPickingDialog(row);
          },
        },
        {
@@ -198,6 +278,13 @@
            showProductStructure(row);
          },
        },
        {
          name: "查看投入",
          type: "text",
          clickFun: row => {
            showInputDialog(row);
          },
        },
      ],
    },
  ]);
@@ -209,6 +296,43 @@
    total: 0,
  });
  const selectedRows = ref([]);

  // æŸ¥çœ‹æŠ•å…¥ç›¸å…³
  const inputDialogVisible = ref(false);
  const inputTableData = ref([]);
  const inputTableLoading = ref(false);
  const inputCurrentRow = ref(null);
  const inputPage = reactive({
    current: 1,
    size: 100,
    total: 0,
  });
  const inputTableColumn = ref([
    {
      label: '投入产品名称',
      prop: 'productName',
    },
    {
      label: '图纸编号',
      prop: 'model'
    },
    {
      label: '投入数量',
      prop: 'quantity',
    },
    {
      label: '单位',
      prop: 'unit',
    },
  ]);

  // é¢†æ–™ç›¸å…³
  const pickingDialogVisible = ref(false);
  const pickingTableData = ref([]);
  const pickingSelectedRows = ref([]);
  const pickingForm = reactive({
    orderId: null,
  });

  const data = reactive({
    searchForm: {
@@ -459,6 +583,117 @@

  const handleConfirmRoute = () => {};

  // æ˜¾ç¤ºæŸ¥çœ‹æŠ•å…¥å¼¹æ¡†
  const showInputDialog = (row) => {
    inputCurrentRow.value = row;
    inputDialogVisible.value = true;
    inputPage.current = 1;
    inputPage.total = 0;
    fetchInputData();
  };

  // æŸ¥çœ‹æŠ•å…¥åˆ†é¡µ
  const handleInputPagination = (obj) => {
    inputPage.current = obj.page;
    inputPage.size = obj.limit;
    fetchInputData();
  };

  // èŽ·å–投入数据
  const fetchInputData = () => {
    inputTableLoading.value = true;
    const params = { productOrderId: inputCurrentRow.value.id, ...inputPage };
    productionProductInputListPage(params)
      .then(res => {
        inputTableLoading.value = false;
        inputTableData.value = res.data.records;
        inputPage.total = res.data.total;
      })
      .catch(err => {
        inputTableLoading.value = false;
        console.error("获取投入数据失败：", err);
      });
  };

  // æ˜¾ç¤ºé¢†æ–™å¼¹æ¡†
  const showPickingDialog = async (row) => {
    pickingForm.orderId = row.id;
    pickingDialogVisible.value = true;
    pickingTableData.value = [];
    
    // èŽ·å–物料清单数据
    try {
      const res = await listProductStructureRecord({ productOrderId: row.id });
      const materials = res.data?.records || [];
      pickingTableData.value = materials.map(item => ({
        ...item,
        quantity: 0,
        unpickedQuantity: (item.demandedQuantity || 0) - (item.pickedQuantity || 0),
      }));
    } catch (e) {
      console.error("获取物料清单失败：", e);
      proxy.$modal.msgError("获取物料清单失败");
    }
  };

  // é¢†æ–™è¡¨æ ¼é€‰æ‹©å˜åŒ–
  const handlePickingSelectionChange = (selection) => {
    pickingSelectedRows.value = selection;
  };

  // é¢†æ–™æ•°é‡å˜åŒ–处理
  const handlePickingQuantityChange = (val, row) => {
    if (val > row.unpickedQuantity) {
      proxy.$modal.msgWarning("领料数量不能超过未领料数量");
      row.quantity = row.unpickedQuantity;
    }
  };

  // ç¡®è®¤é¢†æ–™
  const handlePickingNext = async () => {
    if (pickingSelectedRows.value.length === 0) {
      proxy.$modal.msgWarning("请选择要领料的物料");
      return;
    }
    // æ ¡éªŒé¢†æ–™æ•°é‡
    for (const row of pickingSelectedRows.value) {
      if (row.quantity > row.unpickedQuantity) {
        proxy.$modal.msgWarning(`${row.productName} çš„领料数量不能超过未领料数量`);
        return;
      }
      if (row.quantity <= 0) {
        proxy.$modal.msgWarning(`${row.productName} çš„领料数量必须大于0`);
        return;
      }
    }
    
    // æäº¤é¢†æ–™æ•°æ®
    try {
      const pickData = pickingSelectedRows.value.map(row => ({
        productOrderId: row.productOrderId,
        productStructureRecordId: row.id,
        productModelId: row.productModelId,
        quantity: row.quantity,
      }));
      await pickMaterial(pickData);
      proxy.$modal.msgSuccess("领料成功");
      pickingDialogVisible.value = false;
    } catch (e) {
      console.error("领料失败：", e);
      proxy.$modal.msgError("领料失败");
    }
  };

  // é¢†æ–™è¡¨æ ¼åˆè®¡æ–¹æ³•
  const summarizePickingTable = (param) => {
    return proxy.summarizeTable(param, [
      "quantity",
      "unpickedQuantity",
      "inventoryQuantity",
      "demandedQuantity",
    ]);
  };

  onMounted(() => {
    getList();
  });
@@ -484,4 +719,13 @@
:deep(.purple){
  background-color: #F4DEFA;
}

.picking-footer-info {
  display: flex;
  justify-content: space-between;
  padding: 10px;
  font-size: 14px;
  color: #606266;
}

</style>

 src/views/productionManagement/productionReporting/index.vue

@@ -121,9 +121,6 @@
    </div>
    <form-dia ref="formDia"
              @close="handleQuery"></form-dia>
    <input-modal v-if="isShowInput"
                 v-model:visible="isShowInput"
                 :production-product-main-id="isShowingId" />
  </div>
</template>

@@ -138,7 +135,7 @@
  } from "@/api/productionManagement/productionReporting.js";
  import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";


  const data = reactive({
    searchForm: {
@@ -196,7 +193,7 @@
    {
      label: "创建时间",
      prop: "createTime",
      width: 120,
      width: 180,
    },
    {
      dataType: "action",
@@ -204,13 +201,6 @@
      align: "center",
      fixed: "right",
      operation: [
        {
          name: "查看投入",
          type: "text",
          clickFun: row => {
            showInput(row);
          },
        },
        {
          name: "删除",
          type: "danger",
@@ -378,14 +368,6 @@
      const rowInfo = type === "add" ? selectedRows.value[0] : row;
      formDia.value?.openDialog(type, rowInfo);
    });
  };

  // æ‰“开投入模态框
  const isShowInput = ref(false);
  const isShowingId = ref(0);
  const showInput = row => {
    isShowInput.value = true;
    isShowingId.value = row.id;
  };

  // å¯¼å‡º

 src/views/productionManagement/workOrder/index.vue

@@ -228,6 +228,7 @@
    downProductWorkOrder,
  } from "@/api/productionManagement/workOrder.js";
  import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";

  import QRCode from "qrcode";
  import { getCurrentInstance, reactive, toRefs } from "vue";
  import FilesDia from "./components/filesDia.vue";
@@ -649,6 +650,7 @@
      justify-content: flex-start;
    }
  }

</style>

<style  lang="scss">