Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-06-30 ab6ac91b7ed9ae3f9c68766f499ece11585c8859

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

@@ -503,6 +503,9 @@
        <if test="remark != null and remark != ''">
            , remark= #{remark}
        </if>
        <if test="container != null and container != ''">
            , box_no= #{container}
        </if>
        where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId}
    </update>

@@ -525,6 +528,7 @@
                                                 storage_region,
                                                 `status`,
                                                 enter_storage_time,
                                                 box_no,
                                                 update_time,
                                                 end_time,
                                                 remark
@@ -533,7 +537,7 @@
                   #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
                   ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
                #{flowCard.inventoryQuantity},null,#{storageRegion},
                0,now(),now(),null,#{remark}
                0,now(),#{container},now(),null,#{remark}
               )
    </insert>