From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductionOrderMapper.xml | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 40af51d..8166dad 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -5,7 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrder">
<id column="id" property="id" />
- <result column="sales_ledger_id" property="salesLedgerId" />
<result column="production_plan_ids" property="productionPlanIds" />
<result column="product_model_id" property="productModelId" />
<result column="nps_no" property="npsNo" />
@@ -16,7 +15,6 @@
<result column="complete_quantity" property="completeQuantity" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
- <result column="sales_ledger_product_id" property="salesLedgerProductId" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
<result column="plan_complete_time" property="planCompleteTime" />
@@ -33,7 +31,6 @@
<sql id="ProductionOrderVoColumns">
po.id,
- po.sales_ledger_id,
po.production_plan_ids,
po.product_model_id,
po.nps_no,
@@ -44,13 +41,10 @@
po.complete_quantity,
po.start_time,
po.end_time,
- po.sales_ledger_product_id,
po.create_user,
po.dept_id,
po.plan_complete_time,
po.status,
- sl.sales_contract_no as salesContractNo,
- sl.customer_name as customerName,
p.product_name as productName,
pm.model as model,
tr.process_route_code as processRouteCode,
@@ -59,7 +53,6 @@
<sql id="ProductionOrderVoFrom">
from production_order po
- left join sales_ledger sl on po.sales_ledger_id = sl.id
left join product_model pm on po.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join technology_routing tr on po.technology_routing_id = tr.id
@@ -72,17 +65,11 @@
<if test="c.id != null">
and po.id = #{c.id}
</if>
- <if test="c.salesLedgerId != null">
- and po.sales_ledger_id = #{c.salesLedgerId}
- </if>
<if test="c.productModelId != null">
and po.product_model_id = #{c.productModelId}
</if>
<if test="c.technologyRoutingId != null">
and po.technology_routing_id = #{c.technologyRoutingId}
- </if>
- <if test="c.salesLedgerProductId != null">
- and po.sales_ledger_product_id = #{c.salesLedgerProductId}
</if>
<if test="c.status != null">
and po.status = #{c.status}
--
Gitblit v1.9.3