product-inventory-management-after.git

			@@ -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="sale_ledger_product_id" property="saleLedgerProductId" />
			<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,24 +41,22 @@
			po.complete_quantity,
			po.start_time,
			po.end_time,
			po.sale_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
			tr.process_route_code as processRouteCode,
			tb.bom_no as bomNo
			</sql>

			<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
			left join technology_bom tb on tb.id = tr.bom_id
			</sql>

			<sql id="ProductionOrderWhere">
			@@ -70,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.saleLedgerProductId != null">
			and po.sale_ledger_product_id = #{c.saleLedgerProductId}
			</if>
			<if test="c.status != null">
			and po.status = #{c.status}