order status

Fancy

2024-08-27 d82642e04f2dd9f2dc04dd7196a1e83fcfc95913

order status

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java

@@ -37,6 +37,9 @@
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long proId;

    @TableField(exist = false)
    public String proName;

    /**
    * 生产数量
    */

 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">
@@ -27,10 +30,12 @@
    <select id="selectItems"  parameterType="java.lang.Long" resultMap="BaseResultMap">
        <!--算出完成率 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,oi.number, sum(IFNULL(pap.output_number,0)) as complete_number
        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">

 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml

@@ -15,7 +15,7 @@
            <result property="status" column="status" jdbcType="TINYINT"/>
            <result property="creator" column="creator" jdbcType="VARCHAR"/>
            <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
            <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
    </resultMap>
    <resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
@@ -197,7 +197,7 @@
                <if test="deliveryDate!= null and deliveryDate !=''">
                    delivery_date = #{deliveryDate,jdbcType=VARCHAR},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="creator != null and creator !=''">

 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java

@@ -48,7 +48,7 @@
            throw new RuntimeException("订单名称不能重复");
        }
        extractedCheck(p);
        p.setDeleted(false);
        p.deleted = false;
        BaUser loginUser = userUtil.getUser(UserTokenContext.get());
        if (loginUser != null) {
            p.creator = loginUser.id;