From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 7f84013..d4ffc40 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -14,32 +14,41 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,sl.sales_contract_no,sl.project_name,sl.customer_name,slp.product_category,slp.specification_model
+ select po.*,sl.sales_contract_no,sl.customer_name,slp.product_category,slp.specification_model
from product_order po
left join sales_ledger sl on po.sales_ledger_id = sl.id
left join sales_ledger_product slp on po.product_model_id = slp.id
left join process_route pr on po.route_id = pr.id
<where>
<if test="c.npsNo != null and c.npsNo != ''">
- and po.nps_no = #{c.npsNo}
+ and po.nps_no like concat('%',#{c.npsNo},'%')
</if>
<if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no = #{c.salesContractNo}
- </if>
- <if test="c.projectName != null and c.projectName != ''">
- and sl.project_name = #{c.projectName}
+ and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
<if test="c.customerName != null and c.customerName != ''">
- and sl.customer_name = #{c.customerName}
+ and sl.customer_name like concat('%',#{c.customerName},'%')
</if>
<if test="c.productCategory != null and c.productCategory != ''">
- and slp.product_category = #{c.productCategory}
+ and slp.product_category like concat('%',#{c.productCategory},'%')
</if>
<if test="c.specificationModel != null and c.specificationModel != ''">
- and slp.specification_model = #{c.specificationModel}
+ and slp.specification_model like concat('%',#{c.specificationModel},'%')
</if>
</where>
</select>
+ <select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
+ select
+ po.*,
+ pwo.work_order_no,
+ pwo.report_work,
+ pwo.status,
+ pwo.quantity,
+ pwo.plan_quantity
+ from product_order po
+ left join product_work_order pwo on po.id = pwo.product_order_id
+ where po.id = #{c.id}
+ </select>
</mapper>
--
Gitblit v1.9.3