上海玻璃公司配置文件

chenlu

2025-10-14 6e731e9aeb3a2db04b37050adf4b9d7cee2f8e01

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -658,7 +658,8 @@
                                            status,
                                            remarks,
                                            money,
                                            area
                                            area,
                                            compute_area
        )
        values (
                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},
@@ -669,7 +670,7 @@
        <if test="createTime == null">
            now()
        </if>
                ,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
                ,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea},#{getComputeArea}

               )
    </insert>
@@ -790,10 +791,14 @@
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
                                            status,
                                            area,
                                            compute_area,
                                            remarks
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核"
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
               )
    </insert>

@@ -947,7 +952,8 @@
                                                                             o.batch,
                                                                             fol.remarks,
                                                                             SUM(fol.quantity) as quantity,
                                                                             ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
                                                                             /*ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,*/
                                                                             fol.area as area,
                                                                             ROUND( sum(od.width * od.height * fol.quantity*p.total_thickness*2.5) / 1000000, 2 ) as weight,
                                                                             fol.process_id,
                                                                             aaa.teams_groups_name,
@@ -1000,7 +1006,8 @@
            sum(fol.quantity) as quantity,
            od.product_name,
            od.product_id,
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
            /*ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,*/
            ROUND(sum(fol.compute_area * fol.quantity) , 2 ) as area,
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )*#{thickness}*2.5 as weight
        FROM
            ( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '入库' AND aa.STATUS != '已作废' ) fol