feat(finance): 新增采购应付单管理功能

- 新增采购应付单列表页面，支持多条件筛选和分页查询 - 实现应付单详情弹窗，展示应付单基本信息和状态 - 添加合并付款单功能，支持多应付单合并发起付款 - 实现付款计划选择器，可为每个应付单配置付款计划 - 新增应付单修改和删除功能 - 添加数据字典支持，用于展示产品类型、付款状态等枚举值 - 实现应付单导出功能 - 新增后端付款计划相关接口和实体类 - 添加付款计划Mapper接口及实现 - 实现付款计划服务层接口及业务逻辑
Merge branch 'refs/heads/master' into dev_1.0.0
2025-12-05 14:18:54 +08:00 · 2025-12-05 14:09:36 +08:00 · 2025-12-04 17:46:58 +08:00 · 2025-12-04 10:53:27 +08:00
31 changed files with 1664 additions and 66 deletions
--- a/oms_web/oms_vue/src/api/finance/payable.js
+++ b/oms_web/oms_vue/src/api/finance/payable.js
@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询采购应付单列表
+export function listPayable(query) {
+  return request({
+    url: '/finance/payable/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询付款计划列表
+export function getPaymentPlan(payableBillId) {
+  return request({
+    url: `/finance/payable/plan/${payableBillId}`,
+    method: 'get'
+  })
+}
+
+// 更新付款计划
+export function updatePaymentPlan(payableBillId, data) {
+  return request({
+    url: `/finance/payable/plan/${payableBillId}`,
+    method: 'post',
+    data: data
+  })
+}
--- a/oms_web/oms_vue/src/layout/components/Sidebar/SidebarItem.vue
+++ b/oms_web/oms_vue/src/layout/components/Sidebar/SidebarItem.vue
@ -99,7 +99,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-submenu__title {
-  font-size: 15px;
+  font-size: 14px;
  font-weight: bold;
 }
 </style>
--- a/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/EditForm.vue
@ -0,0 +1,156 @@
+<template>
+  <el-dialog title="修改采购应付单" :visible.sync="internalVisible" width="70%" @close="handleClose">
+    <div class="dialog-body">
+      <!-- Part 1: Details -->
+      <div>
+        <el-divider content-position="left">采购-应付单</el-divider>
+        <div class="details-container">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>应付单编号:</strong> {{ data.payableBillCode }}</div>
+            </el-col>
+            <el-col :span="16">
+              <div class="detail-item"><strong>生成时间:</strong> {{ data.createTime }}</div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>制造商名称:</strong> {{ data.vendorName }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>项目编号:</strong> {{ data.projectCode }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>项目名称:</strong> {{ data.projectName }}</div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>合同编号:</strong> {{ data.orderCode }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>出入库单号:</strong> {{ data.inventoryCode }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item" style="display: flex"><strong>产品类型:</strong>
+                <dict-tag :options="dict.type.product_type" :value="data.productType"/>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>含税总价:</strong> {{ data.totalPriceWithTax }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>未税总价:</strong> {{ data.totalPriceWithoutTax }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>税额:</strong> {{ data.taxAmount }}</div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>未付款金额:</strong> {{ data.unpaidAmount }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>已付款金额:</strong> {{ data.paidAmount }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>付款中金额:</strong> {{ data.payingAmount }}</div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="detail-item"><strong>未收票金额:</strong> {{ data.unInvoicedAmount }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>已收票金额:</strong> {{ data.invoicedAmount }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="detail-item"><strong>收票中金额:</strong> {{ data.invoicingAmount }}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+
+      <!-- Part 2: Tabs -->
+      <div style="margin-top: 20px;">
+        <el-tabs v-model="activeTab">
+          <el-tab-pane label="明细" name="details">
+            <!-- Content for 明细 tab will be added later -->
+            明细内容
+          </el-tab-pane>
+          <el-tab-pane label="付款计划" name="paymentPlan">
+            <PaymentPlan :isInitEdit=true :payableData="data"/>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit">确 定</el-button>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import PaymentPlan from './PaymentPlan.vue';
+
+export default {
+  name: "EditForm",
+  dicts: ['product_type'],
+  components: {
+    PaymentPlan
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Object,
+      default: () => ({})
+    }
+  }, data() {
+    return {
+      internalVisible: this.visible, // Local copy of the visible prop
+      activeTab: 'details',
+    };
+  },
+  watch: {
+    visible(newVal) {
+      this.internalVisible = newVal; // Sync prop to local data
+    },
+    internalVisible(newVal) {
+      this.$emit('update:visible', newVal); // Emit changes to parent
+    }
+  },
+  methods: {
+    handleClose() {
+      this.internalVisible = false; // Close dialog locally
+    },
+    handleSubmit() {
+      this.handleClose();
+    },
+  }
+};
+</script>
+<style scoped>.details-container {
+  border: 1px solid #EBEEF5;
+  padding: 20px;
+  border-radius: 4px;
+}
+
+.detail-item {
+  border: 1px solid #EBEEF5;
+  padding: 10px;
+  border-radius: 4px;
+  margin-bottom: 10px;
+}
+
+.dialog-body {
+  max-height: 70vh;
+  overflow-y: auto;
+}
+</style>
--- a/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/MergePaymentDialog.vue
@ -0,0 +1,330 @@
+<template>
+  <el-dialog title="合并发起付款单" :visible.sync="dialogVisible" width="80%" @close="handleClose" append-to-body>
+    <div class="dialog-body">
+      <el-form ref="form" :model="form" :inline="true" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="付款单类型" prop="paymentBillType">
+              <el-select v-model="form.paymentBillType" placeholder="请选择付款单类型" clearable>
+                <el-option
+                  v-for="dict in paymentBillTypeOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制造商名称">
+              <el-input v-model="form.vendorName" readonly/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预计付款时间" prop="estimatedPaymentTime">
+              <el-date-picker
+                v-model="form.estimatedPaymentTime"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-divider content-position="left">采购应付单表</el-divider>
+      <el-table :data="payableOrdersWithPlans" border max-height="300px" style="margin-bottom: 20px;">
+        <el-table-column label="应付单编号" align="center" prop="payableBillCode" width="150"/>
+        <el-table-column label="预计付款时间" align="center" prop="estimatedPaymentTime" width="180"/>
+        <el-table-column label="付款计划" align="center" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.paymentPlans ? scope.row.paymentPlans.length : 0 }} 条计划</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center" prop="projectName" width="150"/>
+        <el-table-column label="合同编号" align="center" prop="orderCode" width="150"/>
+        <el-table-column label="出入库单号" align="center" prop="inventoryCode" width="150"/>
+        <el-table-column label="付款状态" align="center" prop="paymentStatus" width="120">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.payment_status" :value="scope.row.paymentStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120"/>
+        <el-table-column label="未付款金额" align="center" prop="unpaidAmount" width="120"/>
+        <el-table-column label="本次付款金额" align="center" width="120">
+          <template slot-scope="scope">
+            {{ calculateOrderCurrentPaymentAmount(scope.row.id).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="本次付款比例" align="center" width="120">
+          <template slot-scope="scope">
+            {{ calculateOrderCurrentPaymentRate(scope.row.id).toFixed(2) }}%
+          </template>
+        </el-table-column>
+        <el-table-column label="已付款金额" align="center" prop="paidAmount" width="120"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleOpenPaymentPlanSelector(scope.row, scope.$index)"
+            >选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="total-info">
+        <span>合并应付总金额 (含税): <el-tag type="info">{{ totalPayableAmountWithTax.toFixed(2) }}</el-tag></span>
+        <span style="margin-left: 20px;">计划付款总金额: <el-tag type="success">{{
+            totalPlannedAmount.toFixed(2)
+          }}</el-tag></span>
+      </div>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancel">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm">确 定</el-button>
+    </div>
+    <el-dialog :title="planTitle" :visible.sync="isPaymentPlanSelectorOpen" width="70%"
+               @close="isPaymentPlanSelectorOpen=false" append-to-body>
+      <payment-plan-selector
+        :payable-data="choosePayable"
+        @confirm="handlePaymentPlanConfirm"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isPaymentPlanSelectorOpen=false">取 消</el-button>
+        <!--        <el-button  type="primary" @click="handleConfirm" >确 定</el-button>-->
+        <el-button type="primary" @click="handleConfirm">保 存</el-button>
+      </div>
+    </el-dialog>
+    <!-- 付款计划选择器弹窗 -->
+
+  </el-dialog>
+</template>
+
+<script>
+import PaymentPlan from './PaymentPlan.vue';
+import {getPaymentPlan} from "@/api/finance/payable";
+
+export default {
+  name: "MergePaymentDialog",
+  components: {PaymentPlanSelector: PaymentPlan},
+  dicts: ['payment_status'], // Add dicts for dict-tag
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    payableOrders: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      internalVisible: this.visible,
+      planTitle: '',
+      choosePayable: {},
+      form: {
+        paymentBillType: '1', // Default to a type, or make it dynamic
+        vendorName: '',
+        estimatedPaymentTime: null,
+      },
+      paymentBillTypeOptions: [
+        {label: '普通付款单', value: '1'},
+        {label: '紧急付款单', value: '2'},
+      ],
+      payableOrdersWithPlans: [], // Each order will now have its own paymentPlans array
+      isPaymentPlanSelectorOpen: false,
+      currentPayableOrderIndexForPlan: -1, // Index of the order in payableOrdersWithPlans
+      loadingPaymentPlans: false, // Loading state for fetching payment plans
+    };
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.internalVisible;
+      },
+      set(val) {
+        this.internalVisible = val;
+        this.$emit('update:visible', val);
+      }
+    },
+    totalPayableAmountWithTax() {
+      return this.payableOrdersWithPlans.reduce((sum, order) => sum + (order.totalPriceWithTax || 0), 0);
+    },
+    totalPlannedAmount() {
+      return this.payableOrdersWithPlans.reduce((orderSum, order) => {
+        const orderPlansTotal = (order.paymentPlans || []).reduce((planSum, plan) => planSum + (plan.planAmount || 0), 0);
+        return orderSum + orderPlansTotal;
+      }, 0);
+    },
+  },
+  watch: {
+    visible(newVal) {
+      this.internalVisible = newVal;
+      if (newVal) {
+        this.initDialogData();
+      }
+    },
+    payableOrders: {
+      handler(newVal) {
+        if (this.dialogVisible) {
+          this.initDialogData();
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    initDialogData() {
+      // Initialize form fields
+      if (this.payableOrders.length > 0) {
+        const firstVendorName = this.payableOrders[0].vendorName;
+        const allSameVendor = this.payableOrders.every(order => order.vendorName === firstVendorName);
+        this.form.vendorName = allSameVendor ? firstVendorName : '多个制造商';
+        this.form.estimatedPaymentTime = this.payableOrders[0].estimatedPaymentTime || null; // Use first order's estimated time as default
+      } else {
+        this.form.vendorName = '';
+        this.form.estimatedPaymentTime = null;
+      }
+      this.form.paymentBillType = '1'; // Default
+
+      // Initialize payableOrdersWithPlans
+      this.payableOrdersWithPlans = this.payableOrders.map(order => ({
+        ...order,
+        paymentPlans: order.paymentPlans || [], // Retain existing plans if any, otherwise empty
+        totalPriceWithTax: order.totalPriceWithTax || 0, // Ensure numeric for calculations
+        unpaidAmount: order.unpaidAmount || 0,
+        paidAmount: order.paidAmount || 0, // Ensure numeric for calculations
+      }));
+    },
+    handleClose() {
+      this.dialogVisible = false;
+      this.resetForm();
+    },
+    handleConfirm() {
+      // Validate main form fields
+      if (!this.form.paymentBillType) {
+        this.$modal.msgError('请选择付款单类型');
+        return;
+      }
+      if (!this.form.estimatedPaymentTime) {
+        this.$modal.msgError('请选择预计付款时间');
+        return;
+      }
+
+      // Validate each payable order's payment plans
+      for (const order of this.payableOrdersWithPlans) {
+        if (!order.paymentPlans || order.paymentPlans.length === 0) {
+          this.$modal.msgError(`应付单 ${order.payableBillCode} 至少需要一条付款计划`);
+          return;
+        }
+
+        const totalPlannedAmountForOrder = order.paymentPlans.reduce((sum, plan) => sum + (plan.planAmount || 0), 0);
+        if (Math.abs(totalPlannedAmountForOrder - order.unpaidAmount) > 0.01) { // Compare against unpaidAmount
+          this.$modal.msgError(`应付单 ${order.payableBillCode} 的计划付款总金额 (${totalPlannedAmountForOrder.toFixed(2)}) 与其未付款金额 (${order.unpaidAmount.toFixed(2)}) 不符，请检查。`);
+          return;
+        }
+
+        for (const plan of order.paymentPlans) {
+          if (!plan.planPaymentDate) {
+            this.$modal.msgError(`应付单 ${order.payableBillCode} 的付款计划中预计付款时间不能为空。`);
+            return;
+          }
+          if (plan.planAmount === null || plan.planAmount === undefined || plan.planAmount <= 0) {
+            this.$modal.msgError(`应付单 ${order.payableBillCode} 的付款计划中预计付款金额必须大于0。`);
+            return;
+          }
+          if (plan.planRate === null || plan.planRate === undefined) {
+            this.$modal.msgError(`应付单 ${order.payableBillCode} 的付款计划中应付比例不能为空。`);
+            return;
+          }
+        }
+      }
+
+      // Construct the final data to be emitted to the parent
+      const mergedPaymentData = {
+        paymentBillType: this.form.paymentBillType,
+        estimatedPaymentTime: this.form.estimatedPaymentTime,
+        // Collect all payable orders with their updated payment plans
+        payableOrders: this.payableOrdersWithPlans.map(order => ({
+          id: order.id,
+          payableBillCode: order.payableBillCode,
+          paymentPlans: order.paymentPlans.map(plan => ({
+            planPaymentDate: plan.planPaymentDate,
+            planAmount: plan.planAmount,
+            planRate: plan.planRate,
+            remark: plan.remark,
+          })),
+        })),
+        totalMergePaymentAmount: this.totalPlannedAmount, // Total amount for the merged bill
+      };
+
+      this.$emit('confirm', mergedPaymentData);
+      this.dialogVisible = false;
+    },
+    handleCancel() {
+      this.dialogVisible = false;
+      this.resetForm();
+    },
+    resetForm() {
+      this.form = {
+        paymentBillType: '1',
+        vendorName: '',
+        estimatedPaymentTime: null,
+      };
+      this.payableOrdersWithPlans = [];
+
+      this.currentPayableOrderIndexForPlan = -1;
+      this.loadingPaymentPlans = false;
+    },
+    handleOpenPaymentPlanSelector(row, index) {
+      this.planTitle = `选择付款计划 - ${row.payableBillCode}`;
+      this.choosePayable = row;
+      this.currentPayableOrderIndexForPlan = index;
+      this.isPaymentPlanSelectorOpen = true;
+      console.log(this.choosePayable.id)
+    },
+    handlePaymentPlanConfirm(updatedPlans) {
+      // Update the payment plans for the specific order
+      if (this.currentPayableOrderIndexForPlan !== -1) {
+        this.$set(this.payableOrdersWithPlans[this.currentPayableOrderIndexForPlan], 'paymentPlans', updatedPlans);
+      }
+      this.isPaymentPlanSelectorOpen = false;
+      this.currentPayableOrderIndexForPlan = -1;
+    },
+    calculateOrderCurrentPaymentAmount(orderId) {
+      const order = this.payableOrdersWithPlans.find(o => o.id === orderId);
+      if (order && order.paymentPlans) {
+        return order.paymentPlans.reduce((sum, plan) => sum + (plan.planAmount || 0), 0);
+      }
+      return 0;
+    },
+    calculateOrderCurrentPaymentRate(orderId) {
+      const order = this.payableOrdersWithPlans.find(o => o.id === orderId);
+      if (order && order.paymentPlans && order.unpaidAmount > 0) {
+        const currentAmount = this.calculateOrderCurrentPaymentAmount(orderId);
+        return (currentAmount / order.unpaidAmount * 100);
+      }
+      return 0;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.dialog-body {
+  max-height: 70vh;
+  overflow-y: auto;
+  padding-right: 10px; /* To prevent scrollbar from overlapping content */
+}
+
+.total-info {
+  margin-top: 20px;
+  text-align: right;
+  font-weight: bold;
+}
+</style>
--- a/oms_web/oms_vue/src/views/finance/payable/components/PaymentPlan.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/components/PaymentPlan.vue
@ -0,0 +1,286 @@
+<template>
+
+  <div class="dialog-body">
+    <el-divider content-position="left">付款计划</el-divider>
+    <el-button v-if="isEditing" type="primary" size="mini" @click="handleSavePaymentPlan"
+               style="margin-bottom: 10px;">
+      保存付款计划
+    </el-button>
+    <el-button v-else type="primary" size="mini" @click="isEditing=true"
+               style="margin-bottom: 10px;">
+      编辑
+    </el-button>
+    <el-table :data="paymentPlans" border @selection-change="selectPlan">
+      <el-table-column  type="selection" width="50" align="center"/>
+      <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
+      <el-table-column label="预计付款时间" align="center" width="200">
+        <template slot-scope="scope">
+          <el-date-picker v-model="scope.row.planPaymentDate" type="date" style="width: 180px"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期"
+                          :disabled="!isEditing || scope.row.status === 'paid'"></el-date-picker>
+        </template>
+      </el-table-column>
+      <el-table-column label="预计付款金额" align="center" width="230">
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="scope.row.planAmount"
+            :precision="2"
+            :step="100"
+            :min="0.01"
+            :max="totalPriceWithTax"
+            @change="handleAmountChange(scope.row)"
+            :disabled="!isEditing || scope.row.status === 'paid'"
+          ></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column label="应付比例(%)" align="center" width="230">
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="scope.row.planRate"
+            :precision="2"
+            :step="1"
+            :min="0.01"
+            :max="100"
+            @change="handleRateChange(scope.row)"
+            :disabled="!isEditing || scope.row.status === 'paid'"
+          ></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" placeholder="请输入备注"
+                    :disabled="!isEditing || scope.row.status === 'paid'"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="150" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-if="isEditing"
+                     size="mini"
+                     type="text"
+                     icon="el-icon-plus"
+                     @click="handleAddPaymentPlanRow"
+          >增加下行
+          </el-button>
+          <el-button v-if="isEditing"
+                     size="mini"
+                     type="text"
+                     icon="el-icon-delete"
+                     @click="handleDeletePaymentPlanRow(scope.$index)"
+                     :disabled="paymentPlans.length === 1 || scope.row.status === 'paid'"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="total-info">
+      <span>应付单未付款金额: <el-tag type="info">{{ totalUnpaidAmount.toFixed(2) }}</el-tag></span>
+      <span style="margin-left: 20px;">计划付款总金额: <el-tag type="success">{{
+          totalPlannedAmount.toFixed(2)
+        }}</el-tag></span>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getPaymentPlan, updatePaymentPlan} from "@/api/finance/payable";
+
+export default {
+  name: "PaymentPlanSelector",
+  props: {
+    payableData: {
+      type: Object,
+      default: () => {
+      }
+    },
+    isInitEdit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      selectedPlan:[],
+      isEditing: false,
+      loading: false,
+      paymentPlans: [],
+    };
+  },
+  computed: {
+    title() {
+      return `选择付款计划 - ${this.payableData.payableBillCode}`;
+    },
+    totalPlannedAmount() {
+      return this.paymentPlans.reduce((sum, plan) => sum + (plan.planAmount || 0), 0);
+    },
+    totalUnpaidAmount() {
+      return this.payableData.unpaidAmount || 0;
+    },
+    totalPriceWithTax() {
+      return this.payableData.totalPriceWithTax || 0;
+    }
+  },
+  watch: {
+    'payableData.id': {
+      handler(newVal, oldVal) {
+        if (newVal) {
+          this.fetchPaymentPlans(newVal)
+        }
+      },
+      immediate: true
+    },
+    isInitEdit: {
+      handler(newVal) {
+        if (newVal) {
+          this.isEditing = newVal
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    selectPlan(	selection){
+      this.selectedPlan=selection
+    },
+    fetchPaymentPlans(payableId) {
+      if (this.payableData && payableId) {
+        getPaymentPlan(payableId).then(response => {
+          this.paymentPlans = response.data.map(item => ({
+            ...item,
+            // Add a default status if not present, similar to EditForm.vue
+            status: item.status || 'pending'
+          }));
+          if (this.paymentPlans.length === 0) {
+            this.initDefaultPaymentPlan();
+          }
+        })
+      } else {
+        this.initDefaultPaymentPlan();
+
+      }
+    },
+    initDefaultPaymentPlan() {
+      // Default to a single plan covering the unpaid amount if no initial plans
+      this.paymentPlans = [{
+        planPaymentDate: null,
+        planAmount: this.totalUnpaidAmount,
+        planRate: 100,
+        remark: '',
+        status: 'pending' // Default status
+      }];
+    },
+    handleSavePaymentPlan() {
+      if (!this.validatePaymentPlans()) {
+        return;
+      }
+      if (!this.validatePaymentPlanTotals()) {
+        return;
+      }
+
+      for (let i = 0; i < this.paymentPlans.length; i++) {
+        const plan = this.paymentPlans[i];
+        if (!plan.planPaymentDate) {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的预计付款时间不能为空。`);
+          return;
+        }
+        if (plan.planAmount === null || plan.planAmount === undefined || plan.planAmount === '' || plan.planAmount < 0) {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的预计付款金额不能为空。`);
+          return;
+        }
+        if (plan.planRate === null || plan.planRate === undefined || plan.planRate === '') {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的应付比例不能为空。`);
+          return;
+        }
+      }
+
+      updatePaymentPlan(this.payableData.id, this.paymentPlans).then(() => {
+        this.$modal.msgSuccess("保存成功");
+        this.fetchPaymentPlans(this.payableData.id); // Re-fetch using the correct method and ID
+      });
+    },
+
+    handleAddPaymentPlanRow() {
+      this.paymentPlans.push({
+        planPaymentDate: null,
+        planAmount: 0,
+        planRate: 0,
+        remark: '',
+        status: 'pending' // Default status
+      });
+    },
+    handleDeletePaymentPlanRow(index) {
+      if (this.paymentPlans.length === 1) {
+        this.$modal.msgError("至少需要保留一条付款计划。");
+        return;
+      }
+      // Only allow deletion if not 'paid' or status is not set (newly added)
+      if (this.paymentPlans[index].status === 'paid') {
+        this.$modal.msgError("已付款的计划不能删除。");
+        return;
+      }
+      this.paymentPlans.splice(index, 1);
+    },
+    handleAmountChange(row) {
+      if (this.totalPriceWithTax === 0) {
+        row.planRate = 0;
+        return;
+      }
+      row.planRate = this.$calc.mul((this.$calc.div(row.planAmount, this.totalPriceWithTax,4)), 100);
+    },
+    handleRateChange(row) {
+      row.planAmount = this.$calc.div(this.$calc.mul(this.totalPriceWithTax , row.planRate),100);
+    },
+    validatePaymentPlanTotals() {
+      const totalAmount = this.paymentPlans.reduce((sum, plan) => sum + (plan.planAmount || 0), 0);
+      const totalRate = this.paymentPlans.reduce((sum, plan) => sum + (plan.planRate || 0), 0);
+
+      if (totalAmount !== this.totalPriceWithTax) {
+        this.$modal.msgError(`预计付款金额之和应该等于应付总金额[${this.totalPriceWithTax}]`);
+        return false;
+      }
+      return true;
+    },
+
+    validatePaymentPlans() {
+      if (this.paymentPlans.length === 0) {
+        this.$modal.msgError("请至少添加一条付款计划。");
+        return false;
+      }
+
+      const totalPlannedAmount = this.paymentPlans.reduce((sum, plan) => sum + (plan.planAmount || 0), 0);
+
+      for (let i = 0; i < this.paymentPlans.length; i++) {
+        const plan = this.paymentPlans[i];
+        if (!plan.planPaymentDate) {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的预计付款时间不能为空。`);
+          return false;
+        }
+        if (plan.planAmount === null || plan.planAmount === undefined || plan.planAmount <= 0) {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的预计付款金额必须大于0。`);
+          return false;
+        }
+        if (plan.planRate === null || plan.planRate === undefined || plan.planRate === '') {
+          this.$modal.msgError(`第 ${i + 1} 行付款计划的应付比例不能为空。`);
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-body {
+  max-height: 70vh;
+  overflow-y: auto;
+  padding-right: 10px; /* To prevent scrollbar from overlapping content */
+}
+
+.total-info {
+  margin-top: 20px;
+  text-align: right;
+  font-weight: bold;
+}
+</style>
--- a/oms_web/oms_vue/src/views/finance/payable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/index.vue
@ -0,0 +1,339 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="项目编号" prop="projectCode">
+        <el-input
+          v-model="queryParams.projectCode"
+          placeholder="请输入项目编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应付单编号" prop="payableBillCode">
+        <el-input
+          v-model="queryParams.payableBillCode"
+          placeholder="请输入应付单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制造商名称" prop="vendorName">
+        <el-input
+          v-model="queryParams.vendorName"
+          placeholder="请输入制造商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同编号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出入库单号" prop="inventoryCode">
+        <el-input
+          v-model="queryParams.inventoryCode"
+          placeholder="请输入出入库单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品类型" prop="productType">
+        <el-select v-model="queryParams.productType" placeholder="请选择产品类型" clearable>
+          <el-option
+            v-for="dict in dict.type.product_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="付款状态" prop="paymentStatus">
+        <el-select v-model="queryParams.paymentStatus" placeholder="请选择付款状态" clearable>
+          <el-option
+            v-for="dict in dict.type.payment_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生成时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="预计付款时间">
+        <el-date-picker
+          v-model="estimatedPaymentDateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5" >
+        <el-button type="primary" plain icon="el-icon-plus" @click="handleMergeAndInitiatePayment" v-hasPermi="['finance:payable:mergePayment']">
+          合并并发起付款单
+        </el-button>
+      </el-col>
+      <el-col :span="1.5" >
+        <el-button type="primary" plain icon="el-icon-plus" v-hasPermi="['inventory:inner:add']">
+          合并并发起收票单
+        </el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="payableList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" />
+      <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
+      <el-table-column label="项目名称" align="center" prop="projectName" width="150" />
+      <el-table-column label="应付单编号" align="center" prop="payableBillCode" width="150" />
+      <el-table-column label="生成时间" align="center" prop="createTime" width="180"/>
+      <el-table-column label="预计付款时间" align="center" prop="estimatedPaymentTime" width="180"/>
+      <el-table-column label="预计付款金额" align="center" prop="totalPriceWithTax" width="120" />
+      <el-table-column label="该制造商是否有预付单" align="center" prop="hasAdvancePayment" width="150" />
+      <el-table-column label="预付金额" align="center" prop="advancePaymentAmount" width="120" />
+      <el-table-column label="制造商名称" align="center" prop="vendorName" width="150" />
+      <el-table-column label="合同编号" align="center" prop="orderCode" width="150" />
+      <el-table-column label="出入库单号" align="center" prop="inventoryCode" width="150" />
+      <el-table-column label="产品类型" align="center" prop="productType" width="120">
+         <template slot-scope="scope">
+          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="含税总价" align="center" prop="totalPriceWithTax" width="120" />
+      <el-table-column label="未税总价" align="center" prop="totalPriceWithoutTax" width="120" />
+      <el-table-column label="税额" align="center" prop="taxAmount" width="120" />
+      <el-table-column label="付款状态" align="center" prop="paymentStatus" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.payment_status" :value="scope.row.paymentStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="生成付款单" align="center" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleGeneratePayment(scope.row)"
+          >生成付款单</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="收票状态" align="center" prop="invoiceStatus" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.invoice_status" :value="scope.row.invoiceStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="生成收票单" align="center" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleGenerateInvoice(scope.row)"
+          >生成收票单</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="未付款金额" align="center" prop="unpaidAmount" width="120" />
+      <el-table-column label="付款中金额" align="center" prop="payingAmount" width="120" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['finance:payable:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['finance:payable:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 修改弹窗 -->
+    <edit-form :visible.sync="open" :data="selectedRow" />
+
+    <!-- 合并付款单弹窗 -->
+    <merge-payment-dialog :visible.sync="isMergePaymentDialogOpen" :payable-orders="selectedPayableRows" @confirm="confirmMergePayment" />
+  </div>
+</template>
+
+<script>
+import { listPayable } from "@/api/finance/payable";
+import EditForm from './components/EditForm.vue';
+import MergePaymentDialog from './components/MergePaymentDialog.vue';
+
+export default {
+  name: "Payable",
+  components: { EditForm, MergePaymentDialog },
+  dicts: ['product_type', 'payment_status', 'invoice_status'],
+  data() {
+    return {
+      // 。。。 (other data properties)
+      // 是否显示修改弹窗
+      open: false,
+      // 选中行数据
+      selectedRow: {},
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采购应付单表格数据
+      payableList: [],
+      // 日期范围
+      dateRange: [],
+      // 预计付款日期范围
+      estimatedPaymentDateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectCode: null,
+        projectName: null,
+        payableBillCode: null,
+        vendorName: null,
+        orderCode: null,
+        inventoryCode: null,
+        productType: null,
+        paymentStatus: null,
+        createTimeStart: null,
+        createTimeEnd: null,
+        estimatedPaymentTimeStart: null,
+        estimatedPaymentTimeEnd: null
+      },
+      // 选中行数据
+      selectedPayableRows: [],
+      // 是否显示合并付款弹窗
+      isMergePaymentDialogOpen: false
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询采购应付单列表 */
+    getList() {
+      this.loading = true;
+      if (null != this.dateRange && '' != this.dateRange) {
+        this.queryParams.createTimeStart = this.dateRange[0];
+        this.queryParams.createTimeEnd = this.dateRange[1];
+      }
+      if (null != this.estimatedPaymentDateRange && '' != this.estimatedPaymentDateRange) {
+        this.queryParams.estimatedPaymentTimeStart = this.estimatedPaymentDateRange[0];
+        this.queryParams.estimatedPaymentTimeEnd = this.estimatedPaymentDateRange[1];
+      }
+      listPayable(this.queryParams).then(response => {
+        this.payableList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.estimatedPaymentDateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.createTimeStart=null;
+      this.queryParams.createTimeEnd=null;
+      this.queryParams.estimatedPaymentTimeStart=null;
+      this.queryParams.estimatedPaymentTimeEnd=null;
+      this.handleQuery();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.selectedRow = row;
+      this.open = true;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+       this.$modal.confirm('是否确认删除采购应付单编号为"' + row.payableBillCode + '"的数据项？').then(function() {
+        return Promise.resolve();
+      }).then(() => {
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 生成付款单按钮操作 */
+    handleGeneratePayment(row) {
+      console.log("handleGeneratePayment", row);
+    },
+    /** 生成收票单按钮操作 */
+    handleGenerateInvoice(row) {
+      console.log("handleGenerateInvoice", row);
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.selectedPayableRows = selection;
+    },
+    /** 合并并发起付款单按钮操作 */
+    handleMergeAndInitiatePayment() {
+      if (this.selectedPayableRows.length === 0) {
+        this.$modal.msgWarning("请选择至少一条应付单进行合并操作");
+        return;
+      }
+      let vendorLength = new Set(this.selectedPayableRows.map(item=>item.vendorCode)).size;
+      if (vendorLength > 1) {
+        this.$modal.msgWarning("请选择同一家供应商的应付单进行合并操作");
+        return;
+      }
+
+      this.isMergePaymentDialogOpen = true;
+    },
+    /** 确认合并付款单操作 */
+    confirmMergePayment(paymentData) {
+      console.log("Merged payment data received:", paymentData);
+      // TODO: Call backend API to initiate merged payment
+      // this.$modal.msgSuccess("合并付款单发起成功");
+      this.isMergePaymentDialogOpen = false;
+      this.getList(); // Refresh the list
+    }
+  }
+};
+</script>
--- a/oms_web/oms_vue/src/views/inventory/outer/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/index.vue
@ -28,7 +28,7 @@
    <!-- 操作按钮栏 -->
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['inventory:outer:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini"  @click="handleExport" v-hasPermi="['inventory:outer:export']">导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
--- a/oms_web/oms_vue/src/views/system/role/index.vue
+++ b/oms_web/oms_vue/src/views/system/role/index.vue
@ -534,15 +534,15 @@ export default {
    /** 分配数据权限操作 */
    handleDataScope(row) {
      this.reset()
-      const deptTreeSelect = this.getDeptTree(row.roleId)
+      // const deptTreeSelect = this.getDeptTree(row.roleId)
      getRole(row.roleId).then(response => {
        this.form = response.data
        this.openDataScope = true
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys)
-          })
-        })
+        // this.$nextTick(() => {
+        //   deptTreeSelect.then(res => {
+        //     this.$refs.dept.setCheckedKeys(res.checkedKeys)
+        //   })
+        // })
      })
      this.title = "分配数据权限"
    },
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@ -0,0 +1,72 @@
+flowable:
+  database-schema-update: false
+ruoyi:
+    excelTemplate: /home/application/excelTemplate
+    profile: /home/application/uploadPath
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
+                username: root
+                password: unis@db
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+unis:
+    order:
+        #    执行单截止时间
+        endHour: 96
+    mail:
+        enabled: false
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPayableBillController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPayableBillController.java
@ -1,15 +1,13 @@
 package com.ruoyi.sip.controller;

 import java.util.List;
+
+import com.ruoyi.sip.domain.OmsPaymentBill;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sip.domain.OmsPayableBill;
@ -18,6 +16,10 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.sip.service.IOmsPaymentBillService;
+import com.ruoyi.sip.service.IOmsInvoiceReceiptBillService;
+import com.ruoyi.sip.domain.OmsInvoiceReceiptBill;
+import org.springframework.ui.ModelMap;

 /**
 * 采购应付单Controller
@ -34,6 +36,12 @@ public class OmsPayableBillController extends BaseController
    @Autowired
    private IOmsPayableBillService omsPayableBillService;

+    @Autowired
+    private IOmsPaymentBillService omsPaymentBillService;
+
+    @Autowired
+    private IOmsInvoiceReceiptBillService omsInvoiceReceiptBillService;
+
    @RequiresPermissions("finance:payable:view")
    @GetMapping()
    public String payable()
@ -47,7 +55,7 @@ public class OmsPayableBillController extends BaseController
    @RequiresPermissions("finance:payable:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(OmsPayableBill omsPayableBill)
+    public TableDataInfo list(@RequestBody OmsPayableBill omsPayableBill)
    {
        startPage();
        List<OmsPayableBill> list = omsPayableBillService.selectOmsPayableBillList(omsPayableBill);
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPayablePlanController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsPayablePlanController.java
@ -0,0 +1,35 @@
+package com.ruoyi.sip.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+
+import com.ruoyi.sip.oms.domain.OmsPayablePaymentPlan;
+
+import com.ruoyi.sip.oms.service.IOmsPayablePaymentPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/finance/payable/plan")
+public class OmsPayablePlanController extends BaseController {
+
+
+
+    @Autowired
+    private IOmsPayablePaymentPlanService paymentPlanService;
+
+
+
+    @GetMapping("/{payableBillId}")
+    public AjaxResult getPaymentPlan(@PathVariable("payableBillId") Long payableBillId) {
+        return AjaxResult.success(paymentPlanService.selectOmsPayablePaymentPlanListByPayableBillId(payableBillId));
+    }
+
+    @PostMapping("/{payableBillId}")
+    public AjaxResult updatePaymentPlan(@PathVariable("payableBillId") Long payableBillId, @RequestBody List<OmsPayablePaymentPlan> paymentPlanList) {
+        paymentPlanService.updatePaymentPlans(payableBillId, paymentPlanList);
+        return AjaxResult.success();
+    }
+}
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java
@ -16,7 +16,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
 * @date 2025-10-22
 */
@Data
-@Builder
 public class OmsPayableBill extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@ -27,6 +26,9 @@ public class OmsPayableBill extends BaseEntity
    /** 应付单编号 */
    @Excel(name = "应付单编号")
    private String payableBillCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "生成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;

    /** 预计付款时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ -36,7 +38,12 @@ public class OmsPayableBill extends BaseEntity
    /** 制造商编码 */
    @Excel(name = "制造商编码")
    private String vendorCode;
-
+    @Excel(name = "制造商名称")
+    private String vendorName;
+    @Excel(name = "项目编号")
+    private String projectCode;
+    @Excel(name = "项目名称")
+    private String projectName;
    /** 合同编号 */
    @Excel(name = "合同编号")
    private String orderCode;
@ -48,6 +55,8 @@ public class OmsPayableBill extends BaseEntity
    /** 产品类型 */
    @Excel(name = "产品类型")
    private String productType;
+    /** 产品编码 */
+    private String productCode;

    /** 含税总价 */
    @Excel(name = "含税总价")
@ -61,15 +70,12 @@ public class OmsPayableBill extends BaseEntity
    @Excel(name = "税额")
    private BigDecimal taxAmount;

-    /** 关联的付款单ID */
-    @Excel(name = "关联的付款单ID")
-    private Long paymentBillId;

-    /** 关联的收票单ID */
-    @Excel(name = "关联的收票单ID")
-    private Long invoiceReceiptBillId;

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

+    private Date createTimeStart;
+    private Date createTimeEnd;
+
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/VendorInfo.java
@ -122,4 +122,18 @@ public class VendorInfo extends BaseEntity
        }
    }

+    @Getter
+    public enum PayTypeEnum {
+        INNER_PAY("0", "入库付款"),
+        OUTER_PAY("1", "出库付款"),
+        ;
+        private final String desc;
+        private final String code;
+
+        PayTypeEnum(String code, String desc) {
+            this.desc = desc;
+            this.code = code;
+        }
+    }
+
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryInfoMapper.java
@ -76,4 +76,5 @@ public interface InventoryInfoMapper

    List<InventoryInfo> listByProductSnList(List<String> productSnList);

+    List<InventoryInfo> listByDeliveryId(Long id);
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryOuterMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/InventoryOuterMapper.java
@ -1,5 +1,6 @@
 package com.ruoyi.sip.mapper;

+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.sip.domain.InventoryOuter;
 import com.ruoyi.sip.domain.VendorInfo;
@ -66,4 +67,6 @@ public interface InventoryOuterMapper
    int countByOrderCode(String orderCode);

    String selectVendorById(Long id);
+
+    BigDecimal selectOutPriceByCode(String outerCode);
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/VendorInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/VendorInfoMapper.java
@ -60,4 +60,6 @@ public interface VendorInfoMapper
     * @return 结果
     */
    public int deleteVendorInfoByVendorIds(String[] vendorIds);
+
+    VendorInfo selectVendorInfoByVendorCode(String vendorCode);
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/domain/OmsPayablePaymentPlan.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/domain/OmsPayablePaymentPlan.java
@ -0,0 +1,27 @@
+package com.ruoyi.sip.oms.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+@Data
+public class OmsPayablePaymentPlan extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 应付单ID */
+    private Long payableBillId;
+
+    /** 计划付款时间 */
+    private Date planPaymentDate;
+
+    /** 计划付款金额 */
+    private BigDecimal planAmount;
+
+    /** 计划付款比例 */
+    private BigDecimal planRate;
+
+}
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/mapper/OmsPayablePaymentPlanMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/mapper/OmsPayablePaymentPlanMapper.java
@ -0,0 +1,63 @@
+package com.ruoyi.sip.oms.mapper;
+
+import java.util.List;
+import com.ruoyi.sip.oms.domain.OmsPayablePaymentPlan;
+import org.apache.ibatis.annotations.Param;
+
+public interface OmsPayablePaymentPlanMapper {
+    /**
+     * 根据应付单ID查询付款计划列表
+     *
+     * @param payableBillId 应付单ID
+     * @return 付款计划集合
+     */
+    public List<OmsPayablePaymentPlan> selectOmsPayablePaymentPlanListByPayableBillId(Long payableBillId);
+
+    /**
+     * 插入单个付款计划
+     *
+     * @param omsPayablePaymentPlan 付款计划对象
+     * @return 结果
+     */
+    public int insertOmsPayablePaymentPlan(OmsPayablePaymentPlan omsPayablePaymentPlan);
+
+    /**
+     * 更新单个付款计划
+     *
+     * @param omsPayablePaymentPlan 付款计划对象
+     * @return 结果
+     */
+    public int updateOmsPayablePaymentPlan(OmsPayablePaymentPlan omsPayablePaymentPlan);
+
+    /**
+     * 批量新增付款计划
+     *
+     * @param omsPayablePaymentPlanList 付款计划列表
+     * @return 结果
+     */
+    public int batchOmsPayablePaymentPlan(List<OmsPayablePaymentPlan> omsPayablePaymentPlanList);
+
+    /**
+     * 根据应付单ID删除付款计划
+     *
+     * @param payableBillId 应付单ID
+     * @return 结果
+     */
+    public int deleteOmsPayablePaymentPlanByPayableBillId(Long payableBillId);
+
+    /**
+     * 根据ID删除付款计划
+     *
+     * @param id 付款计划ID
+     * @return 结果
+     */
+    public int deleteOmsPayablePaymentPlanById(Long id);
+
+    /**
+     * 根据应付单ID查询所有付款计划的ID
+     *
+     * @param payableBillId 应付单ID
+     * @return 付款计划ID列表
+     */
+    public List<Long> selectOmsPayablePaymentPlanIdsByPayableBillId(Long payableBillId);
+}
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/service/IOmsPayablePaymentPlanService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/service/IOmsPayablePaymentPlanService.java
@ -0,0 +1,22 @@
+package com.ruoyi.sip.oms.service;
+
+import java.util.List;
+import com.ruoyi.sip.oms.domain.OmsPayablePaymentPlan;
+
+public interface IOmsPayablePaymentPlanService {
+    /**
+     * 根据应付单ID查询付款计划列表
+     *
+     * @param payableBillId 应付单ID
+     * @return 付款计划集合
+     */
+    public List<OmsPayablePaymentPlan> selectOmsPayablePaymentPlanListByPayableBillId(Long payableBillId);
+
+    /**
+     * 更新付款计划
+     *
+     * @param payableBillId 应付单ID
+     * @param paymentPlanList 付款计划列表
+     */
+    public void updatePaymentPlans(Long payableBillId, List<OmsPayablePaymentPlan> paymentPlanList);
+}
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/service/impl/OmsPayablePaymentPlanServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/oms/service/impl/OmsPayablePaymentPlanServiceImpl.java
@ -0,0 +1,58 @@
+package com.ruoyi.sip.oms.service.impl;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.sip.oms.mapper.OmsPayablePaymentPlanMapper;
+import com.ruoyi.sip.oms.domain.OmsPayablePaymentPlan;
+import com.ruoyi.sip.oms.service.IOmsPayablePaymentPlanService;
+
+
+@Service
+public class OmsPayablePaymentPlanServiceImpl implements IOmsPayablePaymentPlanService {
+    @Autowired
+    private OmsPayablePaymentPlanMapper omsPayablePaymentPlanMapper;
+
+    @Override
+    public List<OmsPayablePaymentPlan> selectOmsPayablePaymentPlanListByPayableBillId(Long payableBillId) {
+        return omsPayablePaymentPlanMapper.selectOmsPayablePaymentPlanListByPayableBillId(payableBillId);
+    }
+
+    @Override
+    @Transactional
+    public void updatePaymentPlans(Long payableBillId, List<OmsPayablePaymentPlan> paymentPlanList) {
+        // 获取数据库中现有付款计划的ID
+        List<Long> existingPlanIds = omsPayablePaymentPlanMapper.selectOmsPayablePaymentPlanIdsByPayableBillId(payableBillId);
+        Set<Long> existingPlanIdSet = existingPlanIds.stream().collect(Collectors.toSet());
+
+        // 用于存放前端传入的有效（非新增或已删除）的计划ID
+        Set<Long> incomingPlanIdSet = paymentPlanList.stream()
+                .filter(plan -> plan.getId() != null)
+                .map(OmsPayablePaymentPlan::getId)
+                .collect(Collectors.toSet());
+
+        for (OmsPayablePaymentPlan plan : paymentPlanList) {
+            plan.setPayableBillId(payableBillId);
+            if (plan.getId() == null) {
+                // 新增付款计划
+                plan.setCreateBy(ShiroUtils.getLoginName());
+                omsPayablePaymentPlanMapper.insertOmsPayablePaymentPlan(plan);
+            } else if (existingPlanIdSet.contains(plan.getId())) {
+                // 更新现有付款计划
+                omsPayablePaymentPlanMapper.updateOmsPayablePaymentPlan(plan);
+            }
+            // 如果plan.getId()不为null但不在existingPlanIdSet中，说明是前端新添加但带有id的脏数据，或者是非法数据，这里不处理
+        }
+
+        // 删除数据库中存在但前端未提交的付款计划
+        existingPlanIdSet.removeAll(incomingPlanIdSet);
+        for (Long idToDelete : existingPlanIdSet) {
+            omsPayablePaymentPlanMapper.deleteOmsPayablePaymentPlanById(idToDelete);
+        }
+    }
+}
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IInventoryInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IInventoryInfoService.java
@ -85,4 +85,6 @@ public interface IInventoryInfoService
    void deleteInventoryInfoByInnerIds(String[] idArray);

    void recallByOrderCode(List<String> orderCode);
+
+    List<InventoryInfo> listByDeliveryId(Long id);
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IVendorInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IVendorInfoService.java
@ -20,6 +20,7 @@ public interface IVendorInfoService
     * @return 制造商信息
     */
    public VendorInfo selectVendorInfoByVendorId(Long vendorId);
+    public VendorInfo selectVendorInfoByVendorCode(String vendorCode);

    /**
     * 查询制造商信息列表
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@ -1,5 +1,7 @@
 package com.ruoyi.sip.service.impl;

+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;

@ -17,6 +19,7 @@ import com.ruoyi.sip.mapper.InventoryOuterMapper;
 import com.ruoyi.sip.service.*;
 import com.ruoyi.sip.vo.DeliveryInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sip.mapper.InventoryDeliveryMapper;
@ -59,6 +62,8 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
    @Autowired
    private IOmsPayableBillService payableBillService;

+    @Value("${oms.inventory.innerTax:1.13}")
+    private String defaultTax;
    /**
     * 查询产品库存
     *
@ -104,6 +109,9 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
        if (CollUtil.isEmpty(productSnList) && CollUtil.isEmpty(productSnDataList)) {
            throw new ServiceException("发货清单为空,保存失败");
        }
+        //修改数据的时候同步修改出库价
+        BigDecimal bigDecimal = inventoryOuterMapper.selectOutPriceByCode(inventoryDelivery.getOuterCode());
+
        List<OmsInventoryDeliveryDetail> detailList=new ArrayList<>();
        if (CollUtil.isEmpty(productSnDataList)) {
            List<InventoryInfo> inventoryInfoList = productSnList.stream().map(item -> {
@ -113,6 +121,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
                info.setInventoryStatus(InventoryInfo.InventoryStatusEnum.OUTER.getCode());
                info.setUpdateBy(currentUserId);
                info.setUpdateTime(nowDate);
+                info.setOuterPrice(bigDecimal);
                OmsInventoryDeliveryDetail detail = new OmsInventoryDeliveryDetail();
                detail.setProductSn(item);
                detailList.add(detail);
@ -126,6 +135,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
                inventoryInfo.setOuterCode(inventoryDelivery.getOuterCode());
                inventoryInfo.setUpdateBy(currentUserId);
                inventoryInfo.setUpdateTime(nowDate);
+                inventoryInfo.setOuterPrice(bigDecimal);
                OmsInventoryDeliveryDetail detail = new OmsInventoryDeliveryDetail();
                detail.setProductSn(inventoryInfo.getProductSn());
                detailList.add(detail);
@ -220,6 +230,44 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
        productInfoService.updateCumulativeCount(outerSum, inventoryDelivery.getProductCode());


+        List<ProductInfo> productInfos = productInfoService.selectProductInfoByCodeList(Collections.singletonList(inventoryOuter.getProductCode()));
+        if (CollUtil.isEmpty(productInfos)) {
+            throw new ServiceException("未找到对应产品");
+        }
+
+        ProductInfo productInfo = productInfos.get(0);
+        //生成应付单  取入库价
+        VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorCode(productInfo.getVendorCode());
+        if (vendorInfo != null && VendorInfo.PayTypeEnum.OUTER_PAY.getCode().equals(vendorInfo.getPayType())) {
+            List<InventoryInfo> inventoryInfos = inventoryInfoService.listByDeliveryId(inventoryDelivery.getId());
+            //生成过应付单的不用再次生成
+            inventoryInfos = inventoryInfos.stream().filter(item -> StringUtils.isEmpty(item.getPayableBillCode())).collect(Collectors.toList());
+            if (CollUtil.isEmpty(inventoryInfos)) {
+                return;
+            }
+            OmsPayableBill payableBill = new OmsPayableBill();
+            payableBill.setProductCode(inventoryOuter.getProductCode());
+            payableBill.setEstimatedPaymentTime(DateUtils.addDays(DateUtils.getNowDate(), vendorInfo.getPayConfigDay()));
+            payableBill.setProductType(productInfo.getType());
+            payableBill.setVendorCode(productInfo.getVendorCode());
+            payableBill.setInventoryCode(inventoryDelivery.getOuterCode());
+            BigDecimal allPrice = inventoryInfos.stream().map(InventoryInfo::getInnerPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+            payableBill.setTotalPriceWithTax(allPrice);
+            payableBill.setTotalPriceWithoutTax(allPrice.divide(new BigDecimal(defaultTax), 2, RoundingMode.HALF_UP));
+            payableBill.setTaxAmount(allPrice.subtract(payableBill.getTotalPriceWithoutTax()));
+            payableBill.setProjectCode(inventoryDelivery.getProjectCode());
+            payableBill.setOrderCode(inventoryDelivery.getOrderCode());
+            payableBillService.insertOmsPayableBill(payableBill);
+            List<InventoryInfo> saveList = inventoryInfos.stream().map(item -> {
+                InventoryInfo inventoryInfo = new InventoryInfo();
+                inventoryInfo.setProductSn(item.getProductSn());
+                inventoryInfo.setPayableBillCode(payableBill.getPayableBillCode());
+                return inventoryInfo;
+            }).collect(Collectors.toList());
+            inventoryInfoService.saveBatch(saveList);
+        }
+
+
    }

    @Override
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryInfoServiceImpl.java
@ -207,5 +207,10 @@ public class InventoryInfoServiceImpl implements IInventoryInfoService {
        inventoryInfoMapper.recallByOrderCode(orderCode);
    }

+    @Override
+    public List<InventoryInfo> listByDeliveryId(Long id) {
+        return inventoryInfoMapper.listByDeliveryId(id);
+    }
+

 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
@ -15,6 +15,7 @@ import com.ruoyi.sip.domain.*;
 import com.ruoyi.sip.dto.inventory.InventoryInfoExcelDto;
 import com.ruoyi.sip.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sip.mapper.OmsInventoryInnerMapper;
 import com.ruoyi.common.core.text.Convert;
@ -49,6 +50,8 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
    private IOmsPurchaseOrderService purchaseOrderService;
    @Autowired
    private IOmsPayableBillService payableBillService;
+    @Value("${oms.inventory.innerTax:1.13}")
+    private String defaultTax;
    /**
     * 查询入库单信息
     *
@ -138,24 +141,25 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
        }
        omsInventoryInner.setWarehouseId(warehouseIdList.get(0));

-        //修改对应的采购订单
-        purchaseOrderService.innerWarehouse(omsInventoryInner.getItemId(),omsInventoryInner.getQuantity());
-        
-        //todo  判断制造商是否需要生成应付单
-//        BigDecimal totalPriceWithTax = inventoryInfoList.stream().map(InventoryInfo::getInnerPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-//        //生成应付单
-//        BigDecimal taxAmount = totalPriceWithTax.multiply(new BigDecimal("0.13")).setScale(2, RoundingMode.HALF_UP);
-//        OmsPayableBill payableBill = OmsPayableBill.builder()
-//                .inventoryCode(omsInventoryInner.getInnerCode())
-//                .vendorCode(omsInventoryInner.getVendorCode())
-//                .productType(productInfos.get(0).getType())
-//                .estimatedPaymentTime(DateUtils.addDays(DateUtils.getNowDate(),30))
-//                .totalPriceWithTax(totalPriceWithTax)
-//                .taxAmount(taxAmount)
-//                .totalPriceWithoutTax(totalPriceWithTax.subtract(taxAmount))
-//                .build();
-//        payableBillService.insertOmsPayableBill(payableBill);
-
+        OmsPayableBill payableBill = new OmsPayableBill();
+        VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorCode(vendorCode);
+        if (vendorInfo != null && VendorInfo.PayTypeEnum.INNER_PAY.getCode().equals(vendorInfo.getPayType())) {
+            BigDecimal reduce = inventoryInfoList.stream().map(InventoryInfo::getInnerPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+            //服务金额为单价* 数量  没有具体的详情
+            BigDecimal totalPriceWithTax =Arrays.asList("11","22").contains(omsInventoryInner.getProductCode())?
+                    reduce.multiply(new BigDecimal(omsInventoryInner.getQuantity())).setScale(2, RoundingMode.HALF_UP)
+                    : reduce;
+            //生成应付单
+            payableBill.setInventoryCode(omsInventoryInner.getInnerCode());
+            payableBill.setVendorCode(omsInventoryInner.getVendorCode());
+            payableBill.setProductType(productInfos.get(0).getType());
+            payableBill.setProjectCode(omsInventoryInner.getProductCode());
+            payableBill.setEstimatedPaymentTime(DateUtils.addDays(DateUtils.getNowDate(), vendorInfo.getPayConfigDay()));
+            payableBill.setTotalPriceWithTax(totalPriceWithTax);
+            payableBill.setTotalPriceWithoutTax(totalPriceWithTax.divide(new BigDecimal(defaultTax), 2, RoundingMode.HALF_UP));
+            payableBill.setTaxAmount(totalPriceWithTax.subtract(payableBill.getTotalPriceWithoutTax()));
+            payableBillService.insertOmsPayableBill(payableBill);
+        }
        inventoryInfoList.forEach(item->{
            item.setInnerCode(omsInventoryInner.getInnerCode());
            item.setCreateBy(currentUserId);
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
@ -6,14 +6,17 @@ import java.util.List;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.sip.mapper.OmsPayableBillMapper;
 import com.ruoyi.sip.domain.OmsPayableBill;
+import com.ruoyi.sip.mapper.OmsPayableBillMapper;
 import com.ruoyi.sip.service.IOmsPayableBillService;
-import com.ruoyi.common.core.text.Convert;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.sip.oms.domain.OmsPayablePaymentPlan;
+import com.ruoyi.sip.oms.mapper.OmsPayablePaymentPlanMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * 采购应付单Service业务层处理
@ -26,6 +29,9 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
    @Autowired
    private OmsPayableBillMapper omsPayableBillMapper;

+    @Autowired
+    private OmsPayablePaymentPlanMapper omsPayablePaymentPlanMapper;
+
    /**
     * 查询采购应付单
     *
@ -55,12 +61,26 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
     * @return 结果
     */
    @Override
+    @Transactional
    public int insertOmsPayableBill(OmsPayableBill omsPayableBill) {
        //生成采购应付单编号
        omsPayableBill.setPayableBillCode(generatePayableBillCode());
        omsPayableBill.setCreateTime(DateUtils.getNowDate());
        omsPayableBill.setCreateBy(ShiroUtils.getUserId().toString());
-        return omsPayableBillMapper.insertOmsPayableBill(omsPayableBill);
+        int rows = omsPayableBillMapper.insertOmsPayableBill(omsPayableBill);
+
+        // 创建默认付款计划
+        if (rows > 0) {
+            OmsPayablePaymentPlan defaultPlan = new OmsPayablePaymentPlan();
+            defaultPlan.setPayableBillId(omsPayableBill.getId());
+            defaultPlan.setPlanPaymentDate(omsPayableBill.getEstimatedPaymentTime());
+            defaultPlan.setPlanAmount(omsPayableBill.getTotalPriceWithTax());
+            defaultPlan.setPlanRate(new java.math.BigDecimal(100));
+            defaultPlan.setRemark("默认付款计划");
+            defaultPlan.setCreateBy(ShiroUtils.getLoginName());
+            omsPayablePaymentPlanMapper.batchOmsPayablePaymentPlan(java.util.Collections.singletonList(defaultPlan));
+        }
+        return rows;
    }

    /**
@ -99,6 +119,10 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
     */
    @Override
    public int deleteOmsPayableBillByIds(String ids) {
+        // Also delete payment plans
+        for (String id : Convert.toStrArray(ids)) {
+            omsPayablePaymentPlanMapper.deleteOmsPayablePaymentPlanByPayableBillId(Long.valueOf(id));
+        }
        return omsPayableBillMapper.deleteOmsPayableBillByIds(Convert.toStrArray(ids));
    }

@ -109,7 +133,9 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
     * @return 结果
     */
    @Override
+    @Transactional
    public int deleteOmsPayableBillById(Long id) {
+        omsPayablePaymentPlanMapper.deleteOmsPayablePaymentPlanByPayableBillId(id);
        return omsPayableBillMapper.deleteOmsPayableBillById(id);
    }
 }
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/VendorInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/VendorInfoServiceImpl.java
@ -48,6 +48,11 @@ public class VendorInfoServiceImpl implements IVendorInfoService {
        return vendorInfoMapper.selectVendorInfoByVendorId(vendorId);
    }

+    @Override
+    public VendorInfo selectVendorInfoByVendorCode(String vendorCode) {
+        return vendorInfoMapper.selectVendorInfoByVendorCode(vendorCode);
+    }
+
    /**
     * 查询制造商信息列表
     *
--- a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
@ -15,8 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="totalPriceWithTax"    column="total_price_with_tax"    />
        <result property="totalPriceWithoutTax"    column="total_price_without_tax"    />
        <result property="taxAmount"    column="tax_amount"    />
-        <result property="paymentBillId"    column="payment_bill_id"    />
-        <result property="invoiceReceiptBillId"    column="invoice_receipt_bill_id"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
@ -26,23 +24,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <sql id="selectOmsPayableBillVo">
-        select id, payable_bill_code, estimated_payment_time, vendor_code, order_code, inventory_code, product_type, total_price_with_tax, total_price_without_tax, tax_amount, payment_bill_id, invoice_receipt_bill_id, create_by, create_time, update_by, update_time, remark, del_flag from oms_payable_bill
+        select id, payable_bill_code, estimated_payment_time, vendor_code, order_code, inventory_code, product_type, total_price_with_tax, total_price_without_tax, tax_amount, create_by, create_time, update_by, update_time, remark, del_flag from oms_payable_bill
    </sql>
+    <sql id="selectOmsPayableBillRelationVo">
+        SELECT
+            t1.id,
+            t1.payable_bill_code,
+            t1.estimated_payment_time,
+            t1.vendor_code,
+            t1.order_code,
+            t1.inventory_code,
+            t1.product_type,
+            t1.total_price_with_tax,
+            t1.total_price_without_tax,
+            t1.tax_amount,

+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.remark,
+            t1.del_flag ,
+            t3.project_code,
+            t3.project_name,
+            t4.vendor_name
+        FROM
+            oms_payable_bill t1
+                left join project_order_info t2 on t1.order_code=t2.order_code
+                left join project_info t3 on t2.project_id=t3.id
+                left join oms_vendor_info t4 on t1.vendor_code=t4.vendor_code
+    </sql>
    <select id="selectOmsPayableBillList" parameterType="OmsPayableBill" resultMap="OmsPayableBillResult">
-        <include refid="selectOmsPayableBillVo"/>
+        <include refid="selectOmsPayableBillRelationVo"/>
        <where>  
-            <if test="payableBillCode != null  and payableBillCode != ''"> and payable_bill_code like concat( #{payableBillCode},'%') </if>
-            <if test="estimatedPaymentTime != null "> and estimated_payment_time = #{estimatedPaymentTime}</if>
-            <if test="vendorCode != null  and vendorCode != ''"> and vendor_code = #{vendorCode}</if>
-            <if test="orderCode != null  and orderCode != ''"> and order_code like concat( #{orderCode},'%') </if>
-            <if test="inventoryCode != null  and inventoryCode != ''"> and inventory_code like concat( #{inventoryCode},'%') </if>
-            <if test="productType != null  and productType != ''"> and product_type = #{productType}</if>
-            <if test="totalPriceWithTax != null "> and total_price_with_tax = #{totalPriceWithTax}</if>
-            <if test="totalPriceWithoutTax != null "> and total_price_without_tax = #{totalPriceWithoutTax}</if>
-            <if test="taxAmount != null "> and tax_amount = #{taxAmount}</if>
-            <if test="paymentBillId != null "> and payment_bill_id = #{paymentBillId}</if>
-            <if test="invoiceReceiptBillId != null "> and invoice_receipt_bill_id = #{invoiceReceiptBillId}</if>
+            <if test="payableBillCode != null  and payableBillCode != ''"> and t1.payable_bill_code like concat( #{payableBillCode},'%') </if>
+            <if test="estimatedPaymentTime != null "> and t1.estimated_payment_time = #{estimatedPaymentTime}</if>
+            <if test="vendorCode != null  and vendorCode != ''"> and t1.vendor_code = #{vendorCode}</if>
+            <if test="vendorName != null  and vendorName != ''"> and t4.vendor_name = #{vendorName}</if>
+            <if test="projectCode != null  and projectCode != ''"> and t3.project_code = #{projectCode}</if>
+            <if test="projectName != null  and projectName != ''"> and t3.project_name = #{projectName}</if>
+            <if test="orderCode != null  and orderCode != ''"> and t1.order_code like concat( #{orderCode},'%') </if>
+            <if test="inventoryCode != null  and inventoryCode != ''"> and t1.inventory_code like concat( #{inventoryCode},'%') </if>
+            <if test="productType != null  and productType != ''"> and t1.product_type = #{productType}</if>
+            <if test="totalPriceWithTax != null "> and t1.total_price_with_tax = #{totalPriceWithTax}</if>
+            <if test="totalPriceWithoutTax != null "> and t1.total_price_without_tax = #{totalPriceWithoutTax}</if>
+            <if test="taxAmount != null "> and t1.tax_amount = #{taxAmount}</if>
+            <if test="createTimeStart != null or createTimeEnd != null">
+                <choose>
+                    <when test="createTimeStart != null and createTimeEnd != null">
+                        and t1.create_time between #{createTimeStart}  and #{createTimeEnd}
+                    </when>
+                    <when test="createTimeStart != null">
+                        and t1.create_time <![CDATA[ >= ]]> #{createTimeStart}
+                    </when>
+                    <when test="createTimeEnd != null">
+                        and t1.create_time <![CDATA[ <= ]]> #{createTimeEnd}
+                    </when>
+
+                </choose>
+            </if>
        </where>
    </select>
    
@ -68,8 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="totalPriceWithTax != null">total_price_with_tax,</if>
            <if test="totalPriceWithoutTax != null">total_price_without_tax,</if>
            <if test="taxAmount != null">tax_amount,</if>
-            <if test="paymentBillId != null">payment_bill_id,</if>
-            <if test="invoiceReceiptBillId != null">invoice_receipt_bill_id,</if>
+
+
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
@ -87,8 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="totalPriceWithTax != null">#{totalPriceWithTax},</if>
            <if test="totalPriceWithoutTax != null">#{totalPriceWithoutTax},</if>
            <if test="taxAmount != null">#{taxAmount},</if>
-            <if test="paymentBillId != null">#{paymentBillId},</if>
-            <if test="invoiceReceiptBillId != null">#{invoiceReceiptBillId},</if>
+
+
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
@ -110,8 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="totalPriceWithTax != null">total_price_with_tax = #{totalPriceWithTax},</if>
            <if test="totalPriceWithoutTax != null">total_price_without_tax = #{totalPriceWithoutTax},</if>
            <if test="taxAmount != null">tax_amount = #{taxAmount},</if>
-            <if test="paymentBillId != null">payment_bill_id = #{paymentBillId},</if>
-            <if test="invoiceReceiptBillId != null">invoice_receipt_bill_id = #{invoiceReceiptBillId},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryInfoMapper.xml
@ -94,6 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{item}
        </foreach>
    </select>
+    <select id="listByDeliveryId" resultType="com.ruoyi.sip.domain.InventoryInfo">
+        <include refid="selectInventoryInfoVo"/>
+        where t1.product_sn in (
+        select product_sn from oms_inventory_delivery_detail where delivery_id = #{id}
+        )
+    </select>


    <insert id="insertInventoryInfo" parameterType="InventoryInfo" useGeneratedKeys="true" keyProperty="id">
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml
@ -153,6 +153,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

            select product_code from oms_inventory_outer where id=8)
    </select>
+    <select id="selectOutPriceByCode" resultType="java.math.BigDecimal">
+
+        SELECT t3.price
+        FROM oms_inventory_outer t2
+                 INNER JOIN project_order_info t4 ON t2.order_code = t4.order_code
+                 INNER JOIN project_product_info t3
+                            ON (t2.product_code = t3.product_bom_code AND t3.project_id = t4.project_id)
+        where t2.outer_code = #{outerCode}
+
+    </select>

    <insert id="insertInventoryOuter" parameterType="InventoryOuter" useGeneratedKeys="true" keyProperty="id">
        insert into oms_inventory_outer
--- a/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/VendorInfoMapper.xml
@ -59,6 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectVendorInfoVo"/>
        where t1.vendor_id = #{vendorId}
    </select>
+    <select id="selectVendorInfoByVendorCode" resultType="com.ruoyi.sip.domain.VendorInfo">
+        <include refid="selectVendorInfoVo"/>
+        where t1.vendor_code = #{vendorCode}
+    </select>

    <insert id="insertVendorInfo" parameterType="VendorInfo">
        insert into oms_vendor_info
Author	SHA1	Message	Date
chenhao	94348aebc4	feat(finance): 新增采购应付单管理功能 - 新增采购应付单列表页面，支持多条件筛选和分页查询 - 实现应付单详情弹窗，展示应付单基本信息和状态 - 添加合并付款单功能，支持多应付单合并发起付款 - 实现付款计划选择器，可为每个应付单配置付款计划 - 新增应付单修改和删除功能 - 添加数据字典支持，用于展示产品类型、付款状态等枚举值 - 实现应付单导出功能 - 新增后端付款计划相关接口和实体类 - 添加付款计划Mapper接口及实现 - 实现付款计划服务层接口及业务逻辑	2025-12-05 14:18:54 +08:00
chenhao	1d842d3bf2	Merge branch 'refs/heads/master' into dev_1.0.0	2025-12-05 14:09:36 +08:00
chenhao	1bdc88cd7c	Merge branch 'refs/heads/master' into dev_1.0.0 # Conflicts: # oms_web/oms_vue/src/utils/ruoyi.js	2025-12-04 17:46:58 +08:00
chenhao	1a4f64865a	feat(sip): 新增库存出库价同步及应付单生成功能 - 新增 InventoryInfo.listByDeliveryId 方法以支持按出库单查询库存信息 - 在 InventoryDeliveryServiceImpl 中实现保存出库信息时同步更新出库价 - 实现出库时自动生成应付单逻辑，包括税率配置读取与金额计算 - 增加 selectOutPriceByCode 查询用于获取项目产品的价格信息 - 扩展 VendorInfo 支持付款类型枚举，区分入库付款与出库付款 - 修改 OmsPayableBill 实体类，增加项目编码、名称等字段并优化结构 - 优化应付单 Controller 接口，支持更灵活的查询条件 - 重构应付单 Mapper XML 文件，增强关联查询与筛选功能 - 在应付单 Service 层新增事务控制与默认付款计划创建逻辑 - 移除前端精确货币舍入工具函数，改用 decimal.js 进行高精度运算 - 注册全局计算工具至 Vue 实例，替换原有金额计算方式提升准确性	2025-12-04 10:53:27 +08:00