Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-03 b6831163ebaefff36901a100faae6dcf538b1215

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

@@ -622,7 +622,15 @@
        )
        values (
                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},
                #{flowCard.inventoryQuantity},now(),"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
                #{flowCard.inventoryQuantity},
        <if test="createTime != null">
            #{createTime}
        </if>
        <if test="createTime == null">
            now()
        </if>
                ,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}

               )
    </insert>