From d82642e04f2dd9f2dc04dd7196a1e83fcfc95913 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 11:31:40 +0800
Subject: [PATCH] order status
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
index a3ca0de..363cc2f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
@@ -11,6 +11,9 @@
<result property="number" column="number" jdbcType="INTEGER"/>
<result property="completeNumber" column="complete_number" jdbcType="INTEGER"/>
<result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
+ <result property="proName" column="pro_id" jdbcType="VARCHAR"/>
+ <!-- <association property="proName" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>-->
</resultMap>
<sql id="Base_Column_List">
@@ -25,10 +28,15 @@
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectItems" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from pr_order_item
- where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1
+ <!--绠楀嚭瀹屾垚鐜� Base_Column_List-->
+ SELECT aa.*, concat(round(((complete_number/number) * 100 ),2), '%') as complete_rate from (
+ select oi.id,oi.order_id,oi.pro_id,pp.`name`,oi.number, sum(IFNULL(pap.output_number,0)) as complete_number
+ from (SELECT * from pr_order_item where order_id = #{orderId,jdbcType=BIGINT} and deleted !=1 ) oi
+ LEFT JOIN pr_assembly_plan pap
+ ON oi.order_id = pap.order_id AND oi.pro_id = pap.pro_id
+ LEFT JOIN plt_product pp
+ ON oi.pro_id = pp.id
+ GROUP BY oi.id,oi.order_id,oi.pro_id,oi.number) aa
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_order_item
@@ -46,38 +54,39 @@
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem" useGeneratedKeys="true">
insert into pr_order_item
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="orderId != null">order_id,</if>
- <if test="proId != null">pro_id,</if>
- <if test="number != null">number,</if>
- <if test="completeNumber != null">complete_number,</if>
- <if test="deleted != null">deleted,</if>
+ <if test="id != null and id !=''">id,</if>
+ <if test="orderId!= null and orderId !=''">order_id,</if>
+ <if test="proId != null and proId !=''">pro_id,</if>
+ <if test="number != null and number !=''">number,</if>
+ <if test="completeNumber!= null and completeNumber !=''">complete_number,</if>
+ <if test="deleted != null and deleted !=''">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
- <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
- <if test="number != null">#{number,jdbcType=INTEGER},</if>
- <if test="completeNumber != null">#{completeNumber,jdbcType=INTEGER},</if>
- <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
+ <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+ <if test="orderId!= null and orderId !=''">#{orderId,jdbcType=BIGINT},</if>
+ <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
+ <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
+ <if test="completeNumber!= null and completeNumber !=''">#{completeNumber,jdbcType=INTEGER},</if>
+ <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
+ <!--@mbg.generated-->
update pr_order_item
<set>
- <if test="orderId != null">
+ <if test="orderId!= null and orderId !=''">
order_id = #{orderId,jdbcType=BIGINT},
</if>
- <if test="proId != null">
+ <if test="proId != null and proId !=''">
pro_id = #{proId,jdbcType=BIGINT},
</if>
- <if test="number != null">
+ <if test="number != null and number !=''">
number = #{number,jdbcType=INTEGER},
</if>
- <if test="completeNumber != null">
+ <if test="completeNumber!= null and completeNumber !=''">
complete_number = #{completeNumber,jdbcType=INTEGER},
</if>
- <if test="deleted != null">
+ <if test="deleted != null and deleted !=''">
deleted = #{deleted,jdbcType=TINYINT},
</if>
</set>
@@ -93,7 +102,7 @@
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
<if test="orderId != null and orderId != ''">
- p.orderId = #{orderId,jdbcType=BIGINT} and
+ p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
order by id desc
@@ -110,7 +119,7 @@
where p.deleted!=1
<trim prefix="and " suffixOverrides="and">
<if test="orderId != null and orderId != ''">
- p.orderId = #{orderId,jdbcType=BIGINT} and
+ p.order_id = #{orderId,jdbcType=BIGINT} and
</if>
</trim>
</select>
--
Gitblit v1.8.0