feat(erp): 补充合同信息字段并完善采购计划关联显示

- 在ErpContractOptionVo中添加crm_order全量字段包括订单类型、交货日期、订单状态等
- 添加@JsonFormat注解支持日期格式化
- 新增selectContractsByOrderCodes方法支持按合同编号批量查询
- 更新SQL映射文件中的selectContractPage和新增selectContractsByOrderCodes查询
- 在采购计划服务实现中查询时刷新进度并关联合同详情
- 在前端界面中新增关联合同标签页显示合同详细信息表格
- 重构采购到货界面将采购要求和到货明细合并显示
- 添加合同状态文本转换方法和相关样式定义
This commit is contained in:
2026-07-04 13:38:23 +08:00
parent 5e5c0bae24
commit eecb7fcae6
7 changed files with 276 additions and 17 deletions

View File

@@ -32,17 +32,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY order_id, item_id
</select>
<!-- 合同列表 + 该合同已挂接的采购计划数 -->
<!-- 合同列表 + 该合同已挂接的采购计划数(全字段) -->
<select id="selectContractPage" resultType="com.klp.erp.domain.vo.ErpContractOptionVo">
SELECT
o.order_id AS orderId,
o.order_code AS orderCode,
o.contract_code AS contractCode,
o.contract_name AS contractName,
o.customer AS customer,
o.supplier AS supplier,
o.order_amount AS orderAmount,
o.salesman AS salesman,
o.order_id AS orderId,
o.order_code AS orderCode,
o.contract_code AS contractCode,
o.contract_name AS contractName,
o.customer AS customer,
o.supplier AS supplier,
o.order_amount AS orderAmount,
o.salesman AS salesman,
o.order_type AS orderType,
o.delivery_date AS deliveryDate,
o.order_status AS orderStatus,
o.finance_status AS financeStatus,
o.unpaid_amount AS unpaidAmount,
o.sign_time AS signTime,
o.sign_location AS signLocation,
o.product_content AS productContent,
o.contract_content AS contractContent,
o.supplier_address AS supplierAddress,
o.supplier_phone AS supplierPhone,
o.supplier_bank AS supplierBank,
o.supplier_account AS supplierAccount,
o.supplier_tax_no AS supplierTaxNo,
o.customer_address AS customerAddress,
o.customer_phone AS customerPhone,
o.customer_bank AS customerBank,
o.customer_account AS customerAccount,
o.customer_tax_no AS customerTaxNo,
o.tech_annex AS techAnnex,
o.business_annex AS businessAnnex,
o.production_schedule AS productionSchedule,
o.unit_price_remark AS unitPriceRemark,
o.deposit_payable AS depositPayable,
o.deposit_paid AS depositPaid,
o.deposit_ratio AS depositRatio,
o.status AS status,
o.contract_id AS contractId,
o.annex_files AS annexFiles,
o.remark AS remark,
o.is_top AS isTop,
(SELECT COUNT(*) FROM erp_purchase_plan_contract_rel r
JOIN erp_purchase_plan p ON p.plan_id = r.plan_id AND p.del_flag = '0'
WHERE r.del_flag = '0' AND r.order_id = o.order_id) AS planCount
@@ -88,6 +119,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</select>
<!-- 根据合同编号(order_code)批量查询合同信息(全字段) -->
<select id="selectContractsByOrderCodes" resultType="com.klp.erp.domain.vo.ErpContractOptionVo">
SELECT
order_id AS orderId,
order_code AS orderCode,
contract_code AS contractCode,
contract_name AS contractName,
customer AS customer,
supplier AS supplier,
order_amount AS orderAmount,
salesman AS salesman,
order_type AS orderType,
delivery_date AS deliveryDate,
order_status AS orderStatus,
finance_status AS financeStatus,
unpaid_amount AS unpaidAmount,
sign_time AS signTime,
sign_location AS signLocation,
product_content AS productContent,
contract_content AS contractContent,
supplier_address AS supplierAddress,
supplier_phone AS supplierPhone,
supplier_bank AS supplierBank,
supplier_account AS supplierAccount,
supplier_tax_no AS supplierTaxNo,
customer_address AS customerAddress,
customer_phone AS customerPhone,
customer_bank AS customerBank,
customer_account AS customerAccount,
customer_tax_no AS customerTaxNo,
tech_annex AS techAnnex,
business_annex AS businessAnnex,
production_schedule AS productionSchedule,
unit_price_remark AS unitPriceRemark,
deposit_payable AS depositPayable,
deposit_paid AS depositPaid,
deposit_ratio AS depositRatio,
status AS status,
contract_id AS contractId,
annex_files AS annexFiles,
remark AS remark,
is_top AS isTop
FROM crm_order
WHERE del_flag = 0
AND order_code IN
<foreach collection="codes" item="code" open="(" separator="," close=")">
#{code}
</foreach>
ORDER BY order_id DESC
</select>
<!-- 厂商历史记忆(去重,可按关键字过滤) -->
<select id="selectDistinctManufacturers" resultType="java.lang.String">
SELECT manufacturer FROM (